diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS
index 44007ca482..c4662b044a 100644
--- a/third_party/nixpkgs/.github/CODEOWNERS
+++ b/third_party/nixpkgs/.github/CODEOWNERS
@@ -104,9 +104,9 @@
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1
# Perl
-/pkgs/development/interpreters/perl @volth @stigtsp @zakame
-/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame
-/pkgs/development/perl-modules @volth @stigtsp @zakame
+/pkgs/development/interpreters/perl @stigtsp @zakame
+/pkgs/top-level/perl-packages.nix @stigtsp @zakame
+/pkgs/development/perl-modules @stigtsp @zakame
# R
/pkgs/applications/science/math/R @jbedo @bcdarwin
diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
index 268b1594de..397e5ff5d1 100644
--- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
+++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,10 @@
+###### Description of changes
+
-###### Motivation for this change
-
-
###### Things done
@@ -34,3 +28,14 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
+
+
diff --git a/third_party/nixpkgs/README.md b/third_party/nixpkgs/README.md
index 082469876b..ff66ef0d85 100644
--- a/third_party/nixpkgs/README.md
+++ b/third_party/nixpkgs/README.md
@@ -1,5 +1,10 @@
-
+
+
+
+
+
+
diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix
index a88947b458..c0d3ede73d 100644
--- a/third_party/nixpkgs/lib/attrsets.nix
+++ b/third_party/nixpkgs/lib/attrsets.nix
@@ -327,7 +327,7 @@ rec {
isDerivation "foobar"
=> false
*/
- isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
+ isDerivation = x: x.type or null == "derivation";
/* Converts a store path to a fake derivation. */
toDerivation = path:
diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix
index 8a88d8cfbe..f0e87c30e4 100644
--- a/third_party/nixpkgs/lib/systems/parse.nix
+++ b/third_party/nixpkgs/lib/systems/parse.nix
@@ -364,8 +364,8 @@ rec {
musleabihf = { float = "hard"; };
musl = {};
- uclibceabihf = { float = "soft"; };
- uclibceabi = { float = "hard"; };
+ uclibceabi = { float = "soft"; };
+ uclibceabihf = { float = "hard"; };
uclibc = {};
unknown = {};
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index e803c5ceb4..57d5157bd6 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -1301,6 +1301,12 @@
githubId = 75235;
name = "Michael Walker";
};
+ bartsch = {
+ email = "consume.noise@gmail.com";
+ github = "bartsch";
+ githubId = 3390885;
+ name = "Daniel Martin";
+ };
bartuka = {
email = "wand@hey.com";
github = "wandersoncferreira";
@@ -2218,7 +2224,7 @@
ckie = {
email = "nixpkgs-0efe364@ckie.dev";
github = "ckiee";
- githubId = 2526321;
+ githubId = 25263210;
keys = [{
longkeyid = "rsa4096/0x13E79449C0525215";
fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
@@ -7701,6 +7707,16 @@
githubId = 279868;
name = "Matti Kariluoma";
};
+ matthewpi = {
+ email = "me+nix@matthewp.io";
+ github = "matthewpi";
+ githubId = 26559841;
+ name = "Matthew Penner";
+ keys = [{
+ longkeyid = "ed25519/0x31311906AD4CF6D6";
+ fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6";
+ }];
+ };
maurer = {
email = "matthew.r.maurer+nix@gmail.com";
github = "maurer";
@@ -7747,6 +7763,12 @@
githubId = 1187050;
name = "Maximilian Huber";
};
+ maximsmol = {
+ email = "maximsmol@gmail.com";
+ github = "maximsmol";
+ githubId = 1472826;
+ name = "Max Smolin";
+ };
maxxk = {
email = "maxim.krivchikov@gmail.com";
github = "maxxk";
@@ -8400,6 +8422,17 @@
githubId = 3073833;
name = "Massimo Redaelli";
};
+ mrhedgehog = {
+ name = "Mr Hedgehog";
+ email = "hedgehog@mrhedgehog.xyz";
+ matrix = "@mrhedgehog:jupiterbroadcasting.com";
+ github = "ModdedGamers";
+ githubId = 35778371;
+ keys = [{
+ longkeyid = "rsa4096/0x7D5107866B1C6752";
+ fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752";
+ }];
+ };
mrkkrp = {
email = "markkarpov92@gmail.com";
github = "mrkkrp";
@@ -8544,6 +8577,17 @@
githubId = 25388474;
name = "Matej Urbas";
};
+ mvisonneau = {
+ name = "Maxime VISONNEAU";
+ email = "maxime@visonneau.fr";
+ matrix = "@maxime:visonneau.fr";
+ github = "mvisonneau";
+ githubId = 1761583;
+ keys = [{
+ longkeyid = "rsa4096/0x150D6F0AE9198D24";
+ fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24";
+ }];
+ };
mvnetbiz = {
email = "mvnetbiz@gmail.com";
matrix = "@mvtva:matrix.org";
@@ -8805,6 +8849,12 @@
githubId = 8214542;
name = "Nicolò Balzarotti";
};
+ nidabdella = {
+ name = "Mohamed Nidabdella";
+ email = "nidabdella.mohamed@gmail.com";
+ github = "nidabdella";
+ githubId = 8083813;
+ };
NieDzejkob = {
email = "kuba@kadziolka.net";
github = "NieDzejkob";
@@ -9110,6 +9160,12 @@
githubId = 158758;
name = "Oliver Dunkl";
};
+ ofek = {
+ email = "oss@ofek.dev";
+ github = "ofek";
+ githubId = 9677399;
+ name = "Ofek Lev";
+ };
offline = {
email = "jaka@x-truder.net";
github = "offlinehacker";
@@ -9362,6 +9418,13 @@
githubId = 71795;
name = "Mica Semrick";
};
+ papojari = {
+ email = "papojari-git.ovoid@aleeas.com";
+ matrix = "@papojari:artemislena.eu";
+ github = "papojari";
+ githubId = 81317317;
+ name = "papojari";
+ };
paraseba = {
email = "paraseba@gmail.com";
github = "paraseba";
@@ -14002,6 +14065,12 @@
github = "jpagex";
githubId = 635768;
};
+ vbrandl = {
+ name = "Valentin Brandl";
+ email = "mail+nixpkgs@vbrandl.net";
+ github = "vbrandl";
+ githubId = 20639051;
+ };
portothree = {
name = "Gustavo Porto";
email = "gustavoporto@ya.ru";
diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
index 23303d22c4..d69546cdf0 100644
--- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
@@ -68,7 +68,7 @@ luautf8,,,,,,pstn
luazip,,,,,,
lua-yajl,,,,,,pstn
luuid,,,,,,
-luv,,,,1.42.0-0,,
+luv,,,,1.43.0-0,,
lyaml,,,,,,lblasc
markdown,,,,,,
mediator_lua,,,,,,
diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
index c559d5699d..73a233c5f1 100755
--- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
+++ b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
@@ -25,8 +25,8 @@ from pathlib import Path
log = logging.getLogger()
log.addHandler(logging.StreamHandler())
-ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent
-from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore
+from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
@@ -118,7 +118,7 @@ class LuaEditor(Editor):
def attr_path(self):
return "luaPackages"
- def get_update(self, input_file: str, outfile: str, proc: int):
+ def get_update(self, input_file: str, outfile: str, config: FetchConfig):
_prefetch = generate_pkg_nix
def update() -> dict:
@@ -126,14 +126,14 @@ class LuaEditor(Editor):
sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())
try:
- pool = Pool(processes=proc)
+ pool = Pool(processes=config.proc)
results = pool.map(_prefetch, sorted_plugin_specs)
finally:
pass
self.generate_nix(results, outfile)
- redirects = []
+ redirects = {}
return redirects
return update
@@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin):
cmd.append(plug.version)
- #
if plug.server != "src" and plug.server:
cmd.append(f"--only-server={plug.server}")
-
if plug.luaversion:
with CleanEnvironment():
local_pkgs = str(ROOT.resolve())
@@ -209,7 +207,6 @@ def main():
parser = editor.create_parser()
args = parser.parse_args()
- log.setLevel(LOG_LEVELS[args.debug])
update_plugins(editor, args)
diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 4e410b5914..bf4fcc6a4a 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -65,7 +65,6 @@ with lib.maintainers; {
chia = {
members = [
- atemu
lourkeur
];
scope = "Maintain the Chia blockchain and its dependencies";
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 815da359e6..d7bc1471aa 100644
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -364,6 +364,20 @@
relying on the insecure behaviour before upgrading.
+
+
+ services.k3s.enable no longer implies
+ systemd.enableUnifiedCgroupHierarchy = false,
+ and will default to the systemd
cgroup driver
+ when using services.k3s.docker = true. This
+ change may require a reboot to take effect, and k3s may not be
+ able to run if the boot cgroup hierarchy does not match its
+ configuration. The previous behavior may be retained by
+ explicitly setting
+ systemd.enableUnifiedCgroupHierarchy = false
+ in your configuration.
+
+
The DHCP server (services.dhcpd4,
@@ -752,6 +766,18 @@
directly.
+
+
+ The dendrite package has been upgraded from
+ 0.5.1 to
+ 0.6.5.
+ Instances configured with split sqlite databases, which has
+ been the default in NixOS, require merging of the federation
+ sender and signing key databases. See upstream
+ release
+ notes on version 0.6.0 for details on database changes.
+
+
The existing pkgs.opentelemetry-collector
@@ -1068,6 +1094,12 @@
compatibilty, but will be removed at a later date.
+
+
+ programs.zsh.autosuggestions.strategy now
+ takes a list of strings instead of a string.
+
+
The services.unifi.openPorts option default
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
index 1e7d8413f9..4e1e70be49 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -121,6 +121,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
+- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`.
+ This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration.
+ The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration.
+
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
@@ -289,6 +293,14 @@ In addition to numerous new and upgraded packages, this release has the followin
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
+- The `dendrite` package has been upgraded from 0.5.1 to
+ [0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances
+ configured with split sqlite databases, which has been the default
+ in NixOS, require merging of the federation sender and signing key
+ databases. See upstream [release
+ notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0)
+ on version 0.6.0 for details on database changes.
+
- The existing `pkgs.opentelemetry-collector` has been moved to
`pkgs.opentelemetry-collector-contrib` to match the actual source being the
"contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
@@ -392,6 +404,8 @@ In addition to numerous new and upgraded packages, this release has the followin
combined `influxdb2` package is still provided in this release for
backwards compatibilty, but will be removed at a later date.
+- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
+
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
Configurations using this default will print a warning when rebuilt.
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
index 31aeaad80d..dfafda77cb 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,7 +1,7 @@
{
- x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
- i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
- aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
- x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
- aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
+ x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0";
+ i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0";
+ aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0";
+ x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0";
+ aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0";
}
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index f3570c3f12..6430993d5c 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -169,6 +169,7 @@
./programs/iotop.nix
./programs/java.nix
./programs/k40-whisperer.nix
+ ./programs/kclock.nix
./programs/kdeconnect.nix
./programs/kbdlight.nix
./programs/less.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/kclock.nix b/third_party/nixpkgs/nixos/modules/programs/kclock.nix
new file mode 100644
index 0000000000..42d81d2798
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/kclock.nix
@@ -0,0 +1,13 @@
+{ lib, pkgs, config, ... }:
+with lib;
+let
+ cfg = config.programs.kclock;
+ kclockPkg = pkgs.libsForQt5.kclock;
+in {
+ options.programs.kclock = { enable = mkEnableOption "Enable KClock"; };
+
+ config = mkIf cfg.enable {
+ services.dbus.packages = [ kclockPkg ];
+ environment.systemPackages = [ kclockPkg ];
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix
index fee324cc73..2e53e907d5 100644
--- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix
@@ -22,17 +22,18 @@ in
};
strategy = mkOption {
- type = types.enum [ "history" "match_prev_cmd" ];
- default = "history";
+ type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]);
+ default = [ "history" ];
description = ''
- Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
- There are currently two to choose from:
+ `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated.
+ The strategies in the array are tried successively until a suggestion is found.
+ There are currently three built-in strategies to choose from:
- * history: Chooses the most recent match.
- * match_prev_cmd: Chooses the most recent match whose preceding history item matches
- the most recently executed command (more info). Note that this strategy won't work as
- expected with ZSH options that don't preserve the history order such as
- HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST.
+ - `history`: Chooses the most recent match from history.
+ - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module)
+ - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches
+ the most recently executed command. Note that this strategy won't work as expected with ZSH options that
+ don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
'';
};
@@ -62,7 +63,7 @@ in
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
- export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
+ export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy})
${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"}
${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
index 50b6780bbe..3a36cfa3f3 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
@@ -91,11 +91,6 @@ in
virtualisation.docker = mkIf cfg.docker {
enable = mkDefault true;
};
-
- # TODO: disable this once k3s supports cgroupsv2, either by docker
- # supporting it, or their bundled containerd
- systemd.enableUnifiedCgroupHierarchy = false;
-
environment.systemPackages = [ config.services.k3s.package ];
systemd.services.k3s = {
@@ -119,6 +114,7 @@ in
[
"${cfg.package}/bin/k3s ${cfg.role}"
] ++ (optional cfg.docker "--docker")
+ ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
++ (optional cfg.disableAgent "--disable-agent")
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
++ (optional (cfg.token != "") "--token ${cfg.token}")
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix
index e0269a962f..a1bd73c9e3 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix
+++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix
@@ -81,7 +81,9 @@ in {
user = mkOption {
type = types.str;
default = redisName name;
- defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\"";
+ defaultText = literalExpression ''
+ if name == "" then "redis" else "redis-''${name}"
+ '';
description = "The username and groupname for redis-server.";
};
@@ -105,8 +107,7 @@ in {
bind = mkOption {
type = with types; nullOr str;
- default = if name == "" then "127.0.0.1" else null;
- defaultText = literalExpression ''if name == "" then "127.0.0.1" else null'';
+ default = "127.0.0.1";
description = ''
The IP interface to bind to.
null means "all interfaces".
@@ -117,7 +118,9 @@ in {
unixSocket = mkOption {
type = with types; nullOr path;
default = "/run/${redisName name}/redis.sock";
- defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\"";
+ defaultText = literalExpression ''
+ if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock"
+ '';
description = "The path to the socket to bind to.";
};
@@ -370,7 +373,7 @@ in {
ProtectKernelTunables = true;
ProtectControlGroups = true;
RestrictAddressFamilies =
- optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++
+ optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++
optional (conf.unixSocket != null) "AF_UNIX";
RestrictNamespaces = true;
LockPersonality = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix b/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix
index c967fc3a36..b2885b0941 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/dendrite.nix
@@ -110,6 +110,15 @@ in
'';
};
};
+ options.app_service_api.database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:federationapi.db";
+ description = ''
+ Database for the Appservice API.
+ '';
+ };
+ };
options.client_api = {
registration_disabled = lib.mkOption {
type = lib.types.bool;
@@ -120,6 +129,91 @@ in
'';
};
};
+ options.federation_api.database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:federationapi.db";
+ description = ''
+ Database for the Federation API.
+ '';
+ };
+ };
+ options.key_server.database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:keyserver.db";
+ description = ''
+ Database for the Key Server (for end-to-end encryption).
+ '';
+ };
+ };
+ options.media_api = {
+ database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:mediaapi.db";
+ description = ''
+ Database for the Media API.
+ '';
+ };
+ };
+ base_path = lib.mkOption {
+ type = lib.types.str;
+ default = "${workingDir}/media_store";
+ description = ''
+ Storage path for uploaded media.
+ '';
+ };
+ };
+ options.room_server.database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:roomserver.db";
+ description = ''
+ Database for the Room Server.
+ '';
+ };
+ };
+ options.sync_api.database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:syncserver.db";
+ description = ''
+ Database for the Sync API.
+ '';
+ };
+ };
+ options.user_api = {
+ account_database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:userapi_accounts.db";
+ description = ''
+ Database for the User API, accounts.
+ '';
+ };
+ };
+ device_database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:userapi_devices.db";
+ description = ''
+ Database for the User API, devices.
+ '';
+ };
+ };
+ };
+ options.mscs = {
+ database = {
+ connection_string = lib.mkOption {
+ type = lib.types.str;
+ default = "file:mscs.db";
+ description = ''
+ Database for exerimental MSC's.
+ '';
+ };
+ };
+ };
};
default = { };
description = ''
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix
index c2da0d616a..f5fb2bf530 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix
@@ -7,23 +7,24 @@ let cfg = config.services.input-remapper; in
options = {
services.input-remapper = {
enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons.";
- package = mkOption {
- type = types.package;
- default = pkgs.input-remapper;
- defaultText = literalExpression "pkgs.input-remapper";
- description = ''
- The input-remapper package to use.
- '';
+ package = options.mkPackageOption pkgs "input-remapper" { };
+ enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140";
+ serviceWantedBy = mkOption {
+ default = [ "graphical.target" ];
+ example = [ "multi-user.target" ];
+ type = types.listOf types.str;
+ description = "Specifies the WantedBy setting for the input-remapper service.";
};
};
};
config = mkIf cfg.enable {
- # FIXME: udev rule hangs sometimes when lots of devices connected, so let's not use it
- # config.services.udev.packages = mapper-pkg;
- services.dbus.packages = cfg.package;
- systemd.packages = cfg.package;
- environment.systemPackages = cfg.package;
- systemd.services.input-remapper.wantedBy = [ "graphical.target" ];
+ services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ];
+ services.dbus.packages = [ cfg.package ];
+ systemd.packages = [ cfg.package ];
+ environment.systemPackages = [ cfg.package ];
+ systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy;
};
+
+ meta.maintainers = with lib.maintainers; [ LunNova ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix
index b9d54f27ed..64b74ddd70 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix
@@ -73,7 +73,8 @@ in
PrivateDevices = true;
PrivateUsers = true;
- ProtectClock = true;
+ # Disabled as it does not allow Jellyfin to interface with CUDA devices
+ # ProtectClock = true;
ProtectControlGroups = true;
ProtectHostname = true;
ProtectKernelLogs = true;
@@ -84,7 +85,7 @@ in
RestrictNamespaces = true;
# AF_NETLINK needed because Jellyfin monitors the network connection
- RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" ];
+ RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ];
RestrictRealtime = true;
RestrictSUIDSGID = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix
index 6a9eeb0209..97005c9d91 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix
@@ -49,6 +49,13 @@ in
services.nitter = {
enable = mkEnableOption "If enabled, start Nitter.";
+ package = mkOption {
+ default = pkgs.nitter;
+ type = types.package;
+ defaultText = literalExpression "pkgs.nitter";
+ description = "The nitter derivation to use.";
+ };
+
server = {
address = mkOption {
type = types.str;
@@ -78,8 +85,8 @@ in
staticDir = mkOption {
type = types.path;
- default = "${pkgs.nitter}/share/nitter/public";
- defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"'';
+ default = "${cfg.package}/share/nitter/public";
+ defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"'';
description = "Path to the static files directory.";
};
@@ -306,8 +313,8 @@ in
Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ];
# Some parts of Nitter expect `public` folder in working directory,
# see https://github.com/zedeus/nitter/issues/414
- WorkingDirectory = "${pkgs.nitter}/share/nitter";
- ExecStart = "${pkgs.nitter}/bin/nitter";
+ WorkingDirectory = "${cfg.package}/share/nitter";
+ ExecStart = "${cfg.package}/bin/nitter";
ExecStartPre = "${preStart}";
AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
Restart = "on-failure";
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
index c0a50f07d7..2edd1de83e 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
@@ -11,7 +11,7 @@ in {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \
- --web.listen-address ${cfg.listenAddress}:${toString cfg.port}
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
'';
RestrictAddressFamilies = [
# Need AF_UNIX to collect data
diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix
index cafb44e124..3bf70c4aa4 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix
@@ -962,7 +962,7 @@ in
'') onion.authorizedClients ++
optional (onion.secretKey != null) ''
install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path}
- key="$(cut -f1 -d: ${escapeShellArg onion.secretKey})"
+ key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)"
case "$key" in
("== ed25519v"*"-secret")
install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix
index a01f0049b2..22c16be761 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix
@@ -693,6 +693,7 @@ in
RemainAfterExit = true;
User = "postgres";
Group = "postgres";
+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
};
script = ''
set -o errexit -o pipefail -o nounset -o errtrace
@@ -701,7 +702,8 @@ in
create_role="$(mktemp)"
trap 'rm -f "$create_role"' ERR EXIT
- echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role"
+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
+ echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"
psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
'';
@@ -717,14 +719,14 @@ in
RemainAfterExit = true;
User = config.services.mysql.user;
Group = config.services.mysql.group;
+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
};
script = ''
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
-
- db_password="$(<'${cfg.database.passwordFile}')"
+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
- echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
+ echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
) | mysql -N
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index 7daf0f158b..e046c28dd6 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -924,7 +924,8 @@ in
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
- SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ];
+ SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ]
+ ++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ];
};
};
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl
index 3a5ffe822e..a1653d451f 100644
--- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl
@@ -59,7 +59,7 @@ $ENV{NIXOS_ACTION} = $action;
# This is a NixOS installation if it has /etc/NIXOS or a proper
# /etc/os-release.
die "This is not a NixOS installation!\n" unless
- -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID=nixos/s;
+ -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID="?nixos"?/s;
openlog("nixos", "", LOG_USER);
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 342e8f461b..15b54cd9fe 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -224,6 +224,7 @@ in
initrd-network-ssh = handleTest ./initrd-network-ssh {};
initrdNetwork = handleTest ./initrd-network.nix {};
initrd-secrets = handleTest ./initrd-secrets.nix {};
+ input-remapper = handleTest ./input-remapper.nix {};
inspircd = handleTest ./inspircd.nix {};
installer = handleTest ./installer.nix {};
invoiceplane = handleTest ./invoiceplane.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/input-remapper.nix b/third_party/nixpkgs/nixos/tests/input-remapper.nix
new file mode 100644
index 0000000000..f692564caa
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/input-remapper.nix
@@ -0,0 +1,52 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+ {
+ name = "input-remapper";
+ meta = {
+ maintainers = with pkgs.lib.maintainers; [ LunNova ];
+ };
+
+ machine = { config, ... }:
+ let user = config.users.users.sybil; in
+ {
+ imports = [
+ ./common/user-account.nix
+ ./common/x11.nix
+ ];
+
+ services.xserver.enable = true;
+ services.input-remapper.enable = true;
+ users.users.sybil = { isNormalUser = true; group = "wheel"; };
+ test-support.displayManager.auto.user = user.name;
+ # workaround for pkexec not working in the test environment
+ # Error creating textual authentication agent:
+ # Error opening current controlling terminal for the process (`/dev/tty'):
+ # No such device or address
+ # passwordless pkexec with polkit module also doesn't work
+ # to allow the program to run, we replace pkexec with sudo
+ # and turn on passwordless sudo
+ # this is not correct in general but good enough for this test
+ security.sudo = { enable = true; wheelNeedsPassword = false; };
+ security.wrappers.pkexec = pkgs.lib.mkForce
+ {
+ setuid = true;
+ owner = "root";
+ group = "root";
+ source = "${pkgs.sudo}/bin/sudo";
+ };
+ };
+
+ enableOCR = true;
+
+ testScript = { nodes, ... }: ''
+ start_all()
+ machine.wait_for_x()
+
+ machine.succeed("systemctl status input-remapper.service")
+ machine.execute("su - sybil -c input-remapper-gtk >&2 &")
+
+ machine.wait_for_text("Input Remapper")
+ machine.wait_for_text("Preset")
+ machine.wait_for_text("Change Key")
+ '';
+ })
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/appstream-qt.nix b/third_party/nixpkgs/nixos/tests/installed-tests/appstream-qt.nix
new file mode 100644
index 0000000000..d08187bfe4
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/appstream-qt.nix
@@ -0,0 +1,9 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.libsForQt5.appstream-qt;
+
+ testConfig = {
+ appstream.enable = true;
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/appstream.nix b/third_party/nixpkgs/nixos/tests/installed-tests/appstream.nix
new file mode 100644
index 0000000000..f71a095d44
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/appstream.nix
@@ -0,0 +1,9 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.appstream;
+
+ testConfig = {
+ appstream.enable = true;
+ };
+}
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
index 08785e5e66..079fd54e71 100644
--- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix
@@ -84,6 +84,8 @@ let
in
{
+ appstream = callInstalledTest ./appstream.nix {};
+ appstream-qt = callInstalledTest ./appstream-qt.nix {};
colord = callInstalledTest ./colord.nix {};
flatpak = callInstalledTest ./flatpak.nix {};
flatpak-builder = callInstalledTest ./flatpak-builder.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/keycloak.nix b/third_party/nixpkgs/nixos/tests/keycloak.nix
index 1be3fed6ac..6367ed808e 100644
--- a/third_party/nixpkgs/nixos/tests/keycloak.nix
+++ b/third_party/nixpkgs/nixos/tests/keycloak.nix
@@ -40,7 +40,7 @@ let
environment.systemPackages = with pkgs; [
xmlstarlet
- libtidy
+ html-tidy
jq
];
};
diff --git a/third_party/nixpkgs/nixos/tests/nats.nix b/third_party/nixpkgs/nixos/tests/nats.nix
index bee36f262f..c650904e53 100644
--- a/third_party/nixpkgs/nixos/tests/nats.nix
+++ b/third_party/nixpkgs/nixos/tests/nats.nix
@@ -45,21 +45,19 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
"{}"
).format(" ".join(args))
+ def parallel(*fns):
+ from threading import Thread
+ threads = [ Thread(target=fn) for fn in fns ]
+ for t in threads: t.start()
+ for t in threads: t.join()
+
start_all()
server.wait_for_unit("nats.service")
- client1.fail("test -f ${file}")
-
- # Subscribe on topic on client1 and echo messages to file.
- client1.execute("({} | tee ${file} &)".format(nats_cmd("sub", "--raw", "${topic}")))
-
- # Give client1 some time to subscribe.
- client1.execute("sleep 2")
-
- # Publish message on client2.
- client2.execute(nats_cmd("pub", "${topic}", "hello"))
-
- # Check if message has been received.
- client1.succeed("grep -q hello ${file}")
+ with subtest("pub sub"):
+ parallel(
+ lambda: client1.succeed(nats_cmd("sub", "--count", "1", "${topic}")),
+ lambda: client2.succeed("sleep 2 && {}".format(nats_cmd("pub", "${topic}", "hello"))),
+ )
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
index 323d79c5b8..18b64a958d 100644
--- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
+++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix
@@ -1156,6 +1156,10 @@ let
systemd = {
exporterConfig = {
enable = true;
+
+ extraFlags = [
+ "--collector.enable-restart-count"
+ ];
};
metricProvider = { };
exporterTest = ''
@@ -1166,6 +1170,11 @@ let
'systemd_unit_state{name="basic.target",state="active",type="target"} 1'
)
)
+ succeed(
+ "curl -sSf localhost:9558/metrics | grep '{}'".format(
+ 'systemd_service_restart_total{state="prometheus-systemd-exporter.service"} 0'
+ )
+ )
'';
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix
index 45482c4de0..c5f3cfe5b6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix
@@ -78,13 +78,13 @@ let
in
mkDerivation rec {
pname = "cantata";
- version = "2.4.2";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr";
+ sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix
index ab3267eae7..ebcdb8f429 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "csound";
- version = "6.16.2";
+ version = "6.17.0";
hardeningDisable = [ "format" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
- sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE=";
+ sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0=";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
- homepage = "http://www.csounds.com/";
- license = licenses.gpl2;
+ homepage = "https://csound.com/";
+ license = licenses.lgpl21Plus;
maintainers = [maintainers.marcweber];
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix
index cd5e476b88..6db530a2c2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpodder";
- version = "3.10.17";
+ version = "3.10.21";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd";
+ sha256 = "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1";
};
patches = [
@@ -42,7 +42,10 @@ python3Packages.buildPythonApplication rec {
];
checkInputs = with python3Packages; [
- coverage minimock
+ minimock
+ pytest
+ pytest-httpserver
+ pytest-cov
];
doCheck = true;
@@ -51,6 +54,7 @@ python3Packages.buildPythonApplication rec {
feedparser
dbus-python
mygpoclient
+ requests
pygobject3
eyeD3
podcastparser
@@ -69,7 +73,8 @@ python3Packages.buildPythonApplication rec {
'';
installCheckPhase = ''
- LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests
+ LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py
+ LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
index 8f77518d03..c7c8176132 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
+++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch
@@ -11,41 +11,20 @@
-
-@@ -201,4 +197,4 @@
-
-
-
--
-\ No newline at end of file
-+
--- a/src/gpodder/config.py
+++ b/src/gpodder/config.py
-@@ -91,13 +91,6 @@
- 'retries': 3, # number of retries when downloads time out
- },
+@@ -94,7 +94,7 @@
-- # Software updates from gpodder.org
-- 'software_update': {
+ # Software updates from gpodder.org
+ 'software_update': {
- 'check_on_startup': True, # check for updates on start
-- 'last_check': 0, # unix timestamp of last update check
-- 'interval': 5, # interval (in days) to check for updates
-- },
--
- 'ui': {
- # Settings for the Command-Line Interface
- 'cli': {
++ 'check_on_startup': False, # check for updates on start
+ 'last_check': 0, # unix timestamp of last update check
+ 'interval': 5, # interval (in days) to check for updates
+ },
--- a/src/gpodder/gtkui/main.py
+++ b/src/gpodder/gtkui/main.py
-@@ -224,7 +224,7 @@
- util.idle_add(self.subscribe_to_url, self.options.subscribe)
- elif not self.channels:
- self.on_itemUpdate_activate()
-- elif self.config.software_update.check_on_startup:
-+ elif False and self.config.software_update.check_on_startup:
- # Check for software updates from gpodder.org
- diff = time.time() - self.config.software_update.last_check
- if diff > (60 * 60 * 24) * self.config.software_update.interval:
-@@ -3288,6 +3288,7 @@
+@@ -3445,6 +3445,7 @@
If silent=False, a message will be shown even if no updates are
available (set silent=False when the check is manually triggered).
"""
diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
index 3ecfde7819..b4f450b310 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
- version = "6.2.07";
+ version = "6.2.09";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
- sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY=";
+ sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA=";
};
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix b/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix
new file mode 100644
index 0000000000..d2d4927c11
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix
@@ -0,0 +1,39 @@
+{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "psst";
+ version = "unstable-2022-01-25";
+
+ src = fetchFromGitHub {
+ owner = "jpochyla";
+ repo = pname;
+ rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc";
+ sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU=";
+ };
+
+ cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M=";
+ # specify the subdirectory of the binary crate to build from the workspace
+ buildAndTestSubdir = "psst-gui";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ alsa-lib
+ atk
+ cairo
+ dbus
+ gdk-pixbuf
+ glib
+ gtk3
+ pango
+ ];
+
+ meta = with lib; {
+ description = "Fast and multi-platform Spotify client with native GUI";
+ homepage = "https://github.com/jpochyla/psst";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbrandl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
index c92e9cf7a4..860eca652e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix
@@ -5,14 +5,14 @@
mkDerivation rec {
pname = "qpwgraph";
- version = "0.2.0";
+ version = "0.2.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
- sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw=";
+ sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix
new file mode 100644
index 0000000000..c0966e9ab3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix
@@ -0,0 +1,85 @@
+{ lib, fetchurl
+# Optional due to unfree license.
+, faacSupport ? false
+, glib, python3Packages, gtk3, wrapGAppsHook
+, gsettings-desktop-schemas, intltool, xvfb-run
+, gobject-introspection, gst_all_1, fdk-aac-encoder }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "soundconverter";
+ version = "4.0.3";
+
+ src = fetchurl {
+ url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz";
+ sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0=";
+ };
+
+ buildInputs = [
+ gtk3
+ fdk-aac-encoder
+ gobject-introspection
+ gst_all_1.gst-libav
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-ugly
+ (gst_all_1.gst-plugins-bad.override { inherit faacSupport; })
+ ];
+
+ nativeBuildInputs = [
+ intltool
+ wrapGAppsHook
+ ];
+
+ propagatedBuildInputs = [
+ python3Packages.gst-python
+ python3Packages.distutils_extra
+ python3Packages.setuptools
+ python3Packages.pygobject3
+ ];
+
+ checkInputs = [
+ xvfb-run
+ ];
+
+ postPatch = ''
+ substituteInPlace bin/soundconverter --replace \
+ "DATA_PATH = os.path.join(SOURCE_PATH, 'data')" \
+ "DATA_PATH = '$out/share/soundconverter'"
+ '';
+
+ preCheck = let
+ self = { outPath = "$out"; name = "${pname}-${version}"; };
+ xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath;
+ in ''
+ export HOME=$TMPDIR
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]}
+ # FIXME: Fails due to weird Gio.file_parse_name() behavior.
+ sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py
+ '' + lib.optionalString (!faacSupport) ''
+ substituteInPlace tests/testcases/integration.py --replace \
+ "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \
+ "for encoder in ['fdkaacenc', 'avenc_aac']:"
+ '';
+
+ checkPhase = ''
+ runHook preCheck
+ xvfb-run python tests/test.py
+ runHook postCheck
+ '';
+
+ # Necessary to set GDK_PIXBUF_MODULE_FILE.
+ strictDeps = false;
+
+ meta = with lib; {
+ homepage = "https://soundconverter.org/";
+ description = "Leading audio file converter for the GNOME Desktop";
+ longDescription = ''
+ SoundConverter reads anything the GStreamer library can read,
+ and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files.
+ Uses Python and GTK+ GUI toolkit, and runs on X Window System.
+ '';
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jakubgs ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix
index fa9860ab24..3ec2cda428 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -1,5 +1,6 @@
-{ lib, stdenv
-, fetchgit
+{ lib
+, stdenv
+, fetchFromGitHub
, autoreconfHook
, help2man
, pkg-config
@@ -11,24 +12,25 @@
, boost
, ecasound
, glibcLocales
-, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
+, libGLU
+, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
stdenv.mkDerivation {
- pname = "soundscape-renderer-unstable";
+ pname = "soundscape-renderer";
+ version = "unstable-2016-11-03";
- version = "2016-11-03";
-
- src = fetchgit {
- url = "https://github.com/SoundScapeRenderer/ssr";
+ src = fetchFromGitHub {
+ owner = "SoundScapeRenderer";
+ repo = "ssr";
rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9";
- sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7";
+ sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs=";
};
# Without it doesn't find all of the boost libraries.
- BOOST_LIB_DIR="${boost}/lib";
+ BOOST_LIB_DIR = "${boost}/lib";
# uses the deprecated get_generic_category() in boost_system
- NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
+ NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix
index 207b42e558..f912ef4167 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix
@@ -6,14 +6,14 @@
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
- version = "1.2.11";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8=";
+ hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ=";
};
postPatch = ''
@@ -31,6 +31,7 @@ let chia = python3Packages.buildPythonApplication rec {
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
propagatedBuildInputs = with python3Packages; [
+ aiofiles
aiohttp
aiosqlite
bitstring
@@ -46,6 +47,7 @@ let chia = python3Packages.buildPythonApplication rec {
colorlog
concurrent-log-handler
cryptography
+ dnslib
dnspythonchia
fasteners
keyrings-cryptfile
@@ -55,6 +57,7 @@ let chia = python3Packages.buildPythonApplication rec {
sortedcontainers
watchdog
websockets
+ zstd
];
checkInputs = with python3Packages; [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
index df7eace328..b58524d1ee 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, darwin
, fetchurl
, autoconf
, automake
@@ -27,16 +28,25 @@ stdenv.mkDerivation rec {
sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809";
};
- nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
+ # when building on darwin we need dawin.cctools to provide the correct libtool
+ # as libwally-core detects the host as darwin and tries to add the -static
+ # option to libtool, also we have to add the modified gsed package.
+ nativeBuildInputs = [ autogen autoconf automake gettext pkg-config py3 unzip which ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ] ++ [ libtool ];
buildInputs = [ gmp libsodium sqlite zlib ];
- postPatch = ''
+ # this causes some python trouble on a darwin host so we skip this step.
+ # also we have to tell libwally-core to use sed instead of gsed.
+ postPatch = if !stdenv.isDarwin then ''
patchShebangs \
tools/generate-wire.py \
tools/update-mocks.sh \
tools/mockup.sh \
devtools/sql-rewrite.py
+ '' else ''
+ substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \
+ substituteInPlace external/libwally-core/configure.ac --replace gsed sed
'';
configureFlags = [ "--disable-developer" "--disable-valgrind" ];
@@ -56,6 +66,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ElementsProject/lightning";
maintainers = with maintainers; [ jb55 prusnak ];
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix
index 4928f363d7..f78c0fa3e3 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/electrs/default.nix
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "electrs";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
- hash = "sha256-6TR9OeIAVVbwDrshb9zHTS39x6taNWYK0UyRLbkW+g0=";
+ hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw=";
};
- cargoHash = "sha256-taOrbtx74DICvPLrwym70X3pv7EBA/H22VZmlxefANM=";
+ cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q=";
# needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 297eca2454..6dc644fbb9 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.38.3";
+ version = "2.39.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- hash = "sha256-svNsVdenolrfMGKJvB/8HQMq08Ov5Oe5QooI1jFAcbI=";
+ hash = "sha256-zVefF5CsyVVMNffec/xwA3KmMtZepM51C3Xh0ZCGl0c=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
index 9f5f64f9e5..dd8765db28 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
@@ -15,7 +15,7 @@ from typing import List, Tuple
from pathlib import Path
# Import plugin update library from maintainers/scripts/pluginupdate.py
-ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
+ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore
sys.path.insert(
0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
)
@@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/
class KakouneEditor(pluginupdate.Editor):
- def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
+ def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
with open(outfile, "w+") as f:
diff --git a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
index 4a5f464f4b..efe431c339 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "leo-editor";
- version = "6.5";
+ version = "6.6-b2";
src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
- sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU=";
+ sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA=";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
index a00646437f..2282e58368 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "12.6";
+ version = "13";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
- hash = "sha512-K0HjEO/yw9h+2+Y5CvxyYG1+kx+KH9NSn+QsKCsvh/rG/ilYLYyy93iZfx+wzwrgEfRtfMpZGtDAxd6nyUSnCA==";
+ hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA==";
};
buildCommand = ''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix
index 8ddd0d6a28..3b694e4b15 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "pinegrow";
- version = "6.3";
+ version = "6.4";
src = fetchurl {
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";
- sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz";
+ sha256 = "0i8sg4criimrqmz0g68b8xcwcrb362ssid5jazswpa6hhwj6s5n4";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
index 894b7a43c0..3cfc37b36a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
@@ -18,13 +18,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
- hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY=";
+ hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y=";
};
format = "other";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix
index cd776fb6bf..0da5a2c255 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "sigil";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
repo = "Sigil";
owner = "Sigil-Ebook";
rev = version;
- sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw=";
+ sha256 = "sha256-PsHliyJu61QFTFZUgDtxguu18GBVTOGMW6pPYjHhvG0=";
};
pythonPath = with python3Packages; [ lxml ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
index 5a6545bb1d..f4dbd81167 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
@@ -536,6 +536,19 @@ let
};
};
+ daohong-emilio.yash = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ publisher = "daohong-emilio";
+ name = "yash";
+ version = "0.2.8";
+ sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM=";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kamadorueda ];
+ };
+ };
+
davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-markdownlint";
@@ -684,8 +697,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
- version = "11.7.0";
- sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6";
+ version = "12.0.1";
+ sha256 = "1xv1vzx643qa8jhjpnpv2wrymz38w130vm0idkcl77lh209r5i8x";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -1007,8 +1020,8 @@ let
mktplcRef = {
name = "vscode-pull-request-github";
publisher = "github";
- version = "0.35.2022010609";
- sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa";
+ version = "0.37.2022030309";
+ sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v";
};
meta = { license = lib.licenses.mit; };
};
@@ -1167,10 +1180,14 @@ let
mktplcRef = {
name = "latex-workshop";
publisher = "James-Yu";
- version = "8.2.0";
- sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2";
+ version = "8.23.0";
+ sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY=";
};
meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
+ description = "LaTeX Workshop Extension";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop";
+ homepage = "https://github.com/James-Yu/LaTeX-Workshop";
license = licenses.mit;
};
};
@@ -1783,6 +1800,23 @@ let
};
};
+ skellock.just = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "just";
+ publisher = "skellock";
+ version = "2.0.0";
+ sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4=";
+ };
+ meta = with lib; {
+ changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md";
+ description = "Provides syntax and recipe launcher for Just scripts";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just";
+ homepage = "https://github.com/skellock/vscode-just";
+ license = licenses.mit;
+ maintainers = with maintainers; [ maximsmol ];
+ };
+ };
+
skyapps.fish-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "fish-vscode";
@@ -2067,11 +2101,12 @@ let
mktplcRef = {
name = "vscode-pitch-black-theme";
publisher = "ViktorQvarfordt";
- version = "1.2.4";
- sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw=";
+ version = "1.3.0";
+ sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g=";
};
- meta = {
- license = lib.licenses.mit;
+ meta = with lib; {
+ license = licenses.mit;
+ maintainers = with maintainers; [ wolfangaukang ];
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 5e8337f6b0..7fc805a8b1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "04lyih67vcf2hficvlv1r25k8k48n9x15sbqrfp1syzhy5i4zch3";
- x86_64-darwin = "0460mh1ah9hswn8ihais5hzvz453r36ay2bb3hy3z1grfs3s5blk";
- aarch64-linux = "1db2r4ja0srya2lw900l4mk24xva00kf7vxajcb7q0rab4cpfr3n";
- aarch64-darwin = "04c43ibbarsqdm1wcsmsi9rnfsl3lyq638d3j0dj94xifk0v61j9";
- armv7l-linux = "1qzi2biy5mjbxdgcakzmid68ykq6vrgj4lqmz0jk3g46r4kpnrgd";
+ x86_64-linux = "09hqcym8dj4d8r5ibdzypdmjxdw4ix24zq688vnb4kfas2jbb3hi";
+ x86_64-darwin = "1wij82gl1wqrprrfn9cfih19wr4h3bn2xapr1l2l0mkansrzsvg5";
+ aarch64-linux = "09x93i190lmxb3ygzjcmb7ag3dz7ixf07yk7zqc7ljrnn5f0b6ag";
+ aarch64-darwin = "1k7glnqy0vjx55chjpwbgwipcvzb0vx0wmvqis865pvzmr0d06a0";
+ armv7l-linux = "0vkivg1f61k8vkr0j9dm7fw2klh45xxnp07pill1gmrwxafm5bra";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.65.0";
+ version = "1.65.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
index 39c04314af..4fd3e89ec5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0a38bjkksna7q2lhcm1hgfn189jw3k8svw0jf591bpq7jvknim1v";
- x86_64-darwin = "173rhavczm0k9qgrlz68rdvwsmy3ynq2g14shx9gipchr1i0rih5";
- aarch64-linux = "00xkhwvxmyiyy9k1vh23sqyib584qafzs1m57xraqq3n8098jrng";
- armv7l-linux = "0lqq54hnv4b1m47cya7196cn00jwslcsh5ykicgq0dxljrcawi0y";
+ x86_64-linux = "09zpc8c2il6x88h65kbm6z8vfnx0byzpcqqy9a1za5ilqr3dhk43";
+ x86_64-darwin = "09m2ij0phf5ni5m110z2bnmd9z50lz1qsh7w7cfawycjhwsl602z";
+ aarch64-linux = "1nsdn9mc4ahrz392w2z071sfxc5jmwhamlaid2qy899cc7sk8nqr";
+ armv7l-linux = "1ii6li6l09ccxf0gyjy3f5752kr4a8pga5w0a0ndgfa73mhlamin";
}.${system};
sourceRoot = {
@@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.65.0";
+ version = "1.65.1";
pname = "vscodium";
executableName = "codium";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch
new file mode 100644
index 0000000000..696077d29d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/appdir.patch
@@ -0,0 +1,23 @@
+diff --git a/Ryujinx.Common/ReleaseInformations.cs b/Ryujinx.Common/ReleaseInformations.cs
+index 35890406..cca77163 100644
+--- a/Ryujinx.Common/ReleaseInformations.cs
++++ b/Ryujinx.Common/ReleaseInformations.cs
+@@ -42,12 +42,14 @@ namespace Ryujinx.Common
+
+ public static string GetBaseApplicationDirectory()
+ {
+- if (IsFlatHubBuild())
+- {
++ //if (IsFlatHubBuild())
++ //{
++ // This needs to be a mutable path, while CurrentDomain.BaseDirectory refers to the nix store.
++ // AppDataManager.BaseDirPath refers to ".config/Ryujinx" on Linux.
+ return AppDataManager.BaseDirPath;
+- }
++ //}
+
+- return AppDomain.CurrentDomain.BaseDirectory;
++ //return AppDomain.CurrentDomain.BaseDirectory;
+ }
+ }
+ }
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
index 1a2d122e63..2ac16662b8 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
@@ -1,8 +1,6 @@
{ lib
, buildDotnetModule
, fetchFromGitHub
-, makeDesktopItem
-, copyDesktopItems
, dotnetCorePackages
, libX11
, libgdiplus
@@ -19,13 +17,13 @@
buildDotnetModule rec {
pname = "ryujinx";
- version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+ version = "1.1.64"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
- rev = "3705c206688c69d3348f5cec84dc480d8d7c578e";
- sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908";
+ rev = "54bfaa125d9b6ae1be53ec431d40326fba51d0de";
+ sha256 = "0p8wmnm8sjx7wqb5z62mp8c3cwrv241ji3fawj2qgqx3k9jlb31i";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
@@ -41,7 +39,6 @@ buildDotnetModule rec {
executables = [ "Ryujinx" ];
nativeBuildInputs = [
- copyDesktopItems
wrapGAppsHook
];
@@ -54,7 +51,6 @@ buildDotnetModule rec {
gtk3
libX11
libgdiplus
- ffmpeg
SDL2_mixer
openal
libsoundio
@@ -63,34 +59,31 @@ buildDotnetModule rec {
];
patches = [
- ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux.
+ ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux.
];
preInstall = ''
- # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349
- mkdir -p $out/lib/sndio-6
- ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
-
+ # Ryujinx tries to use ffmpeg from PATH
makeWrapperArgs+=(
- --suffix LD_LIBRARY_PATH : "$out/lib/sndio-6"
+ --suffix PATH : ${lib.makeBinPath [ ffmpeg ]}
)
-
- for i in 16 32 48 64 96 128 256 512 1024; do
- install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
- done
'';
- desktopItems = [
- (makeDesktopItem {
- desktopName = "Ryujinx";
- name = "ryujinx";
- exec = "Ryujinx";
- icon = "ryujinx";
- comment = meta.description;
- type = "Application";
- categories = [ "Game" ];
- })
- ];
+ preFixup = ''
+ mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages}
+ pushd ${src}/distribution/linux
+
+ install -D ./ryujinx.desktop $out/share/applications/ryujinx.desktop
+ install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml
+ install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg
+
+ substituteInPlace $out/share/applications/ryujinx.desktop --replace \
+ "Exec=Ryujinx" "Exec=$out/bin/Ryujinx"
+
+ popd
+ '';
+
+ passthru.updateScript = ./updater.sh;
meta = with lib; {
homepage = "https://ryujinx.org/";
@@ -108,5 +101,4 @@ buildDotnetModule rec {
platforms = [ "x86_64-linux" ];
mainProgram = "Ryujinx";
};
- passthru.updateScript = ./updater.sh;
}
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/log.patch b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/log.patch
deleted file mode 100644
index 57e96e5c25..0000000000
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/log.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Ryujinx/Configuration/LoggerModule.cs b/Ryujinx/Configuration/LoggerModule.cs
-index 44631ea0..534576bc 100644
---- a/Ryujinx/Configuration/LoggerModule.cs
-+++ b/Ryujinx/Configuration/LoggerModule.cs
-@@ -1,6 +1,7 @@
- using Ryujinx.Common;
- using Ryujinx.Common.Logging;
- using System;
-+using System.IO;
-
- namespace Ryujinx.Configuration
- {
-@@ -74,7 +75,7 @@ namespace Ryujinx.Configuration
- if (e.NewValue)
- {
- Logger.AddTarget(new AsyncLogTargetWrapper(
-- new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"),
-+ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"),
- 1000,
- AsyncLogTargetOverflowAction.Block
- ));
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh
index 4b5fa4834f..9c2f69e606 100755
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/updater.sh
@@ -1,6 +1,6 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6
-set -euxo pipefail
+set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
DEPS_FILE="$(realpath "./deps.nix")"
@@ -31,7 +31,7 @@ NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}"
OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
-echo "comparing versions $OLD_VERSION => $NEW_VERSION"
+echo "comparing versions $OLD_VERSION -> $NEW_VERSION"
if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
echo "Already up to date! Doing nothing"
exit 0
@@ -42,6 +42,8 @@ SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --qui
cd ../../../..
update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT"
+echo "building Nuget lockfile"
+
STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)"
SRC="$(mktemp -d /tmp/ryujinx-src.XXX)"
cp -rT "$STORE_SRC" "$SRC"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
index 55080f333c..4d2db993b8 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "4.15.5";
+ version = "4.15.6";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg=";
+ sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0=";
};
libPath = lib.makeLibraryPath (with xorg; [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
index cd4972de45..39fb78b317 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix
@@ -25,14 +25,14 @@
stdenv.mkDerivation rec {
pname = "foxotron";
- version = "2021-08-13";
+ version = "2022-03-06";
src = fetchFromGitHub {
owner = "Gargaj";
repo = "Foxotron";
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w=";
+ sha256 = "sha256-w66wi+aMwQa9akfNA/1cS6UmDXPWC4OPK9BIa9Kt47A=";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix
new file mode 100644
index 0000000000..b0e346331b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, mkDerivation
+, fetchpatch
+, fetchFromGitHub
+, cmake
+, extra-cmake-modules
+, qtbase
+, wrapQtAppsHook
+, libraw
+, exiv2
+, zlib
+, alglib
+, pkg-config
+, makeDesktopItem
+, copyDesktopItems
+}:
+
+mkDerivation rec {
+ pname = "hdrmerge";
+ version = "unstable-2020-11-12";
+ src = fetchFromGitHub {
+ owner = "jcelaya";
+ repo = "hdrmerge";
+ rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da";
+ sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ wrapQtAppsHook
+ copyDesktopItems
+ ];
+
+ buildInputs = [ qtbase libraw exiv2 zlib alglib ];
+
+ cmakeFlags = [
+ "-DALGLIB_DIR:PATH=${alglib}"
+ ];
+
+ patches = [
+ (fetchpatch {
+ # patch FindAlglib.cmake to respect ALGLIB_DIR
+ # see https://github.com/jcelaya/hdrmerge/pull/213
+ name = "patch-hdrmerge-CMake.patch";
+ url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
+ sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
+ })
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "HDRMerge";
+ genericName = "HDR raw image merge";
+ desktopName = "HDRMerge";
+ comment = meta.description;
+ icon = "hdrmerge";
+ exec = "hdrmerge %F";
+ categories = [ "Graphics" ];
+ mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ];
+ terminal = false;
+ })
+ ];
+
+ postInstall = ''
+ install -Dm444 ../data/images/icon.png $out/share/icons/hicolor/128x128/apps/hdrmerge.png
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/jcelaya/hdrmerge";
+ description = "Combines two or more raw images into an HDR";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.paperdigits ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix
index ec2ac709f8..3e68a4b946 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix
@@ -5,7 +5,6 @@
, gnumake
, makeWrapper
, pkg-config
-, fetchpatch
, autopanosiftc
, boost
, cairo
@@ -37,21 +36,13 @@
stdenv.mkDerivation rec {
pname = "hugin";
- version = "2019.0.0";
+ version = "2021.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
- sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";
+ sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk=";
};
- patches = [
- # Fixes build with exiv2 0.27.1
- (fetchpatch {
- url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch";
- sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r";
- })
- ];
-
buildInputs = [
boost
cairo
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
index 4dc5506aed..bbc0c2d912 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
- version = "1.0.06";
+ version = "1.1.01";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
- sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM=";
+ sha256 = "sha256-HgyqpZTf9GTsbDi1+e20YNoFIPYtTHQd8KC626G0038=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix
index cf16ecc03c..084787d631 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/openboard/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake
, qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler
, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg
, libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:
@@ -32,6 +32,15 @@ in mkDerivation rec {
sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M=";
};
+ patches = [
+ # Poppler requires at least C++17
+ (fetchpatch {
+ name = "use-c-17-for-pdf-on-linux-builds";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard";
+ sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8=";
+ })
+ ];
+
postPatch = ''
substituteInPlace OpenBoard.pro \
--replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix
index 092366652d..7965f82412 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix
@@ -1,64 +1,80 @@
{ lib
-, dbus
, stdenv
+, rustPlatform
+, fetchFromGitHub
+, dbus
+, ffmpeg
+, x264
+, libva
, gst_all_1
, xorg
, libdrm
-, libva
-, fetchzip
-, copyDesktopItems
-, fontconfig
-, libpng
-, pipewire
-, makeWrapper
-, autoPatchelfHook
+, pkg-config
+, pango
+, cmake
+, autoconf
+, libtool
+, nodePackages
+, ApplicationServices
+, Carbon
+, Cocoa
+, VideoToolbox
}:
-stdenv.mkDerivation rec {
+rustPlatform.buildRustPackage rec {
pname = "weylus";
version = "0.11.4";
- src = fetchzip {
- url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip";
- sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk=";
- stripRoot = false;
+ src = fetchFromGitHub {
+ owner = "H-M-H";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l";
};
- installPhase = ''
- runHook preInstall
-
- install -Dm755 ./weylus $out/bin/weylus
- copyDesktopItems ./weylus.desktop
-
- runHook postInstall
- '';
-
buildInputs = [
- libpng
+ ffmpeg
+ x264
+ ] ++ lib.optionals stdenv.isDarwin [
+ ApplicationServices
+ Carbon
+ Cocoa
+ VideoToolbox
+ ] ++ lib.optionals stdenv.isLinux [
dbus
- libdrm
- fontconfig
libva
gst_all_1.gst-plugins-base
- pipewire
- # autoPatchelfHook complains if these are missing, even on wayland
+ xorg.libXext
xorg.libXft
xorg.libXinerama
xorg.libXcursor
+ xorg.libXrender
+ xorg.libXfixes
+ xorg.libXtst
xorg.libXrandr
xorg.libXcomposite
- xorg.libXtst
+ xorg.libXi
+ xorg.libXv
+ pango
+ libdrm
];
- nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ];
+ nativeBuildInputs = [
+ cmake
+ nodePackages.typescript
+ ] ++ lib.optionals stdenv.isLinux [
+ pkg-config
+ autoconf
+ libtool
+ ];
- postFixup = let
- GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
- gst_all_1.gst-plugins-base
- pipewire
- ];
- in ''
- wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH}
+ cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0";
+
+ cargoBuildFlags = [ "--features=ffmpeg-system" ];
+ cargoTestFlags = [ "--features=ffmpeg-system" ];
+
+ postInstall = ''
+ install -vDm755 weylus.desktop $out/share/applications/weylus.desktop
'';
meta = with lib; {
@@ -66,6 +82,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/H-M-H/Weylus";
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ lom ];
- platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
index bec3164a00..c998309bdd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "batsignal";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = version;
- sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U=";
+ sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI=";
};
buildInputs = [ libnotify glib ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
new file mode 100644
index 0000000000..d3c32cf964
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch
@@ -0,0 +1,31 @@
+From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001
+From: "P. R. d. O"
+Date: Fri, 4 Mar 2022 07:03:17 -0600
+Subject: [PATCH] Pillow update
+
+---
+ pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 5dc25e0..b3ba397 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -11,7 +11,7 @@ readme = "README.rst"
+ [tool.poetry.dependencies]
+ python = "^3.7"
+ logbook = "^1.5.3"
+-Pillow = "^8.2.0"
++Pillow = "^9.0.0"
+ requests = "^2.24.0"
+ kiss-headers = "^2.2.3"
+ single-version = "^1.5.1"
+@@ -33,4 +33,4 @@ skip-string-normalization = true
+
+ [build-system]
+ requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++build-backend = "poetry.core.masonry.api"
+--
+2.35.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix
new file mode 100644
index 0000000000..1401a7a8df
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix
@@ -0,0 +1,102 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, wrapGAppsHook
+, atk
+, gdk-pixbuf
+, gobject-introspection
+, gtk3
+, gst-plugins-good
+, libhandy
+, librsvg
+, networkmanager
+, pango
+, gst-python
+, kiss-headers
+, Logbook
+, pillow
+, poetry-core
+, pygobject3
+, python
+, python-zbar
+, requests
+, single-version
+, pytestCheckHook }:
+
+buildPythonApplication rec {
+ pname = "cobang";
+ version = "0.9.6";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "hongquan";
+ repo = "CoBang";
+ rev = "v${version}";
+ sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw=";
+ };
+
+ patches = [
+ ./0001-Poetry-core-and-pillow-9.patch
+ ];
+
+ nativeBuildInputs = [
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ propagatedBuildInputs = [
+ gst-python
+ kiss-headers
+ Logbook
+ pillow
+ poetry-core
+ pygobject3
+ python-zbar
+ requests
+ single-version
+ ];
+
+ buildInputs = [
+ atk
+ gdk-pixbuf
+ # Needed to detect namespaces
+ gobject-introspection
+ gst-plugins-good
+ libhandy
+ networkmanager
+ pango
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # Wrapping this manually for SVG recognition
+ dontWrapGApps = true;
+
+ postInstall = ''
+ # Needed by the application
+ cp -R data $out/${python.sitePackages}/
+
+ # Icons and applications
+ install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/
+ install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/
+ substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \
+ --replace "Exec=" "Exec=$out/bin/"
+ '';
+
+ preFixup = ''
+ wrapProgram $out/bin/cobang \
+ ''${gappsWrapperArgs[@]} \
+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+ --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ '';
+
+ meta = with lib; {
+ description = "A QR code scanner desktop app for Linux";
+ homepage = "https://github.com/hongquan/CoBang";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ wolfangaukang ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
index 777c4b97d2..18b61bc8a9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
- version = "1.12.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
- sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE=";
+ sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g=";
fetchSubmodules = true;
};
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
cp cubiomes-viewer $out/bin
mkdir -p $out/share/pixmaps
- cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png
+ cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
index ba1682f02d..61dd6e4a6d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "dbeaver";
- version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256
+ version = "22.0.0"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
- sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg=";
+ sha256 = "sha256-LSEsaCEUoKViKC+IjJrV/w1VzOGi4EOr4LnAutOIyJU=";
};
fetchedMavenDeps = stdenv.mkDerivation {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix
index 850bca3320..dee6f5c663 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ddgr/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, python3, installShellFiles }:
stdenv.mkDerivation rec {
- version = "1.9";
+ version = "2.0";
pname = "ddgr";
src = fetchFromGitHub {
owner = "jarun";
repo = "ddgr";
rev = "v${version}";
- sha256 = "0qbdq7k0mmvkjp6qzz88n7vf29liqn6y5w4y39ldqdc8hzw5sld7";
+ sha256 = "sha256-otfa2t/tfpYKqQu+VQxRKryUsIxM3JKILc3zseTC2KM=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
index 17ce1d562b..116d5430c2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dunst";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "sha256-bSlSOAxIcFS5B5o3pWmXFsKthAXzbCltnbLAV/bIHLw=";
+ sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU=";
};
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
index d1a8bd1077..cc6d4e33fb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix
@@ -3,15 +3,15 @@
}:
let
pname = "josm";
- version = "18360";
+ version = "18387";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s=";
+ sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
- sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8=";
+ sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
index 0688c189e4..1688639083 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/marktext/default.nix
@@ -2,12 +2,12 @@
let
pname = "marktext";
- version = "v0.16.3";
+ version = "v0.17.1";
name = "${pname}-${version}-binary";
src = fetchurl {
url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";
- sha256 = "0s93c79vy2vsi7b6xq4hvsvjjad8bdkhl1q135vp98zmbf7bvm9b";
+ sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7";
};
appimageContents = appimageTools.extractType2 {
@@ -48,7 +48,7 @@ appimageTools.wrapType2 rec {
description = "A simple and elegant markdown editor, available for Linux, macOS and Windows";
homepage = "https://marktext.app";
license = licenses.mit;
- maintainers = with maintainers; [ nh2 ];
+ maintainers = with maintainers; [ nh2 eduarrrd ];
platforms = [ "x86_64-linux" ];
mainProgram = "marktext";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
index 39348b9ede..976c3c7978 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "mkgmap";
- version = "4896";
+ version = "4897";
src = fetchurl {
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
- sha256 = "1tPKZASmU0xfQgNZJYzhtvm0f7ynrWk/RWCFZ1kseKs=";
+ sha256 = "RR8o8stOnL6nnEkCtRT9tgo8foSxd6ASTsRcGDgbQRk=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
index 4cd7692f67..f6490906b5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
@@ -9,13 +9,13 @@
buildGoPackage rec {
pname = "mob";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
- sha256 = "sha256-NXctu5gg0QfiTZ7osQ0yzETabGDuEeTVZBPFyLeNq8k=";
+ sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix
index b822a7ed11..1aa4a3660c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix
@@ -1,29 +1,43 @@
{ lib
, buildGoModule
, fetchFromGitHub
-, pkg-config
, cairo
, gobject-introspection
, gtk3
, gtk-layer-shell
-}:
+, pkg-config
+, wrapGAppsHook
+, xdg-utils }:
buildGoModule rec {
pname = "nwg-drawer";
- version = "0.1.11";
+ version = "0.2.8";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA=";
+ sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w=";
};
- vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk=";
-
- nativeBuildInputs = [ pkg-config ];
+ vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14=";
buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ];
+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+
+ doCheck = false;
+
+ preInstall = ''
+ mkdir -p $out/share/nwg-drawer
+ cp -r desktop-directories drawer.css $out/share/nwg-drawer
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PATH : ${xdg-utils}/bin
+ --prefix XDG_DATA_DIRS : $out/share
+ )
+ '';
meta = with lib; {
description = "Application drawer for sway Wayland compositor";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
index 5e71f7d0d1..607d02a484 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick
+{ stdenv, fetchurl, lib, makeWrapper, electron_16, makeDesktopItem, graphicsmagick
, writeScript }:
let
- electron = electron_13;
+ electron = electron_16;
icon = fetchurl {
url =
"https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png";
@@ -31,11 +31,11 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.13.23";
+ version = "0.13.30";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
- sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c";
+ sha256 = "ymdqdDD7WWfol/jLBsz8tEzcN7Ed1HSIrkuA51cvKKw=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
@@ -68,6 +68,7 @@ in stdenv.mkDerivation rec {
description =
"A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md";
+ downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
license = licenses.obsidian;
maintainers = with maintainers; [ conradmearns zaninime ];
platforms = [ "x86_64-linux" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oil/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oil-buku/default.nix
similarity index 82%
rename from third_party/nixpkgs/pkgs/applications/misc/oil/default.nix
rename to third_party/nixpkgs/pkgs/applications/misc/oil-buku/default.nix
index 173cea2ee1..e0c0548828 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/oil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/oil-buku/default.nix
@@ -15,12 +15,6 @@ stdenvNoCC.mkDerivation rec {
substituteInPlace src/oil --replace \
"LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib"
- substituteInPlace Makefile --replace \
- "LIBDIR ?= /usr/local/lib/oil" "LIBDIR ?= ${placeholder "out"}/lib" \
-
- substituteInPlace Makefile --replace \
- "BINDIR ?= /usr/local/bin" "BINDIR ?= ${placeholder "out"}/bin"
-
substituteInPlace src/json-to-line.jq --replace \
"/usr/bin/env -S jq" "${jq}/bin/jq"
@@ -28,6 +22,11 @@ stdenvNoCC.mkDerivation rec {
"/usr/bin/env -S awk" "${gawk}/bin/awk"
'';
+ makeFlags = [
+ "BINDIR=${placeholder "out"}/bin"
+ "LIBDIR=${placeholder "out"}/lib"
+ ];
+
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix
index 230ec3182b..f888d162fc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "p2pool";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "SChernykh";
repo = "p2pool";
rev = "v${version}";
- sha256 = "sha256-ohfC10U7srs5IrFWPF5AKPwXPHaRxlYRK4ZZ0pE8tEs=";
+ sha256 = "sha256-cQd3dtih7C+pEmkvlrsYTJtQWBVVMiFbtNQUM0Ck3tg=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sigi/default.nix
index 731608db7d..674432e7a0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sigi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sigi/default.nix
@@ -2,25 +2,30 @@
rustPlatform.buildRustPackage rec {
pname = "sigi";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-1xZMj6NjwA9pVOEL4CDv4XHC3usu3WdjsLJuW3vgxc8=";
+ sha256 = "sha256-N+8DdokiYW5mHIQJisdTja8xMVGip37X6c/xBYnQaRU=";
};
nativeBuildInputs = [ installShellFiles ];
+ # As part of its tests, sigi hard-codes a location to BATS based on git
+ # submodules. The tests are recommeded to skip for Linux packaging. They'll
+ # move to Rust after this issue: https://github.com/hiljusti/sigi/issues/19
+ checkFlags = [ "SKIP_BATS_TESTS=1" ];
+
postInstall = ''
installManPage sigi.1
'';
- cargoSha256 = "sha256-NUWm2GkK7bASo6bAOgQgHate45iDG5l3G/KhtLrjzQ8=";
+ cargoSha256 = "sha256-vO9ocTDcGt/T/sLCP+tCHXihV1H2liFDjI7OhhmPd3I=";
passthru.tests.version = testVersion { package = sigi; };
meta = with lib; {
- description = "CLI tool for organization and planning";
+ description = "Organizing CLI for people who don't love organizing.";
homepage = "https://github.com/hiljusti/sigi";
license = licenses.gpl2;
maintainers = with maintainers; [ hiljusti ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix
index 531bc48935..85f4ffec5f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/snowsql/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
, rpmextract
, patchelf
@@ -9,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "snowsql";
majorVersion = "1.2";
- version = "${majorVersion}.9";
+ version = "${majorVersion}.21";
src = fetchurl {
url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm";
- sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8";
+ sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
index 7617984ac9..08a54f4958 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "2.9.1";
+ version = "2.9.2";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY=";
+ sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix
new file mode 100644
index 0000000000..fdae9753ed
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ pname = "sway-launcher-desktop";
+ version = "1.5.4";
+
+ src = fetchFromGitHub {
+ owner = "Biont";
+ repo = "sway-launcher-desktop";
+ rev = "v${version}";
+ sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa";
+ };
+
+ postPatch = ''
+ patchShebangs ${pname}.sh
+ '';
+
+ buildInputs = [ fzf gawk ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ install -d $out/bin
+ install ${pname}.sh $out/bin/${pname}
+ wrapProgram $out/bin/${pname} \
+ --prefix PATH : ${lib.makeBinPath [ gawk fzf ]}
+ '';
+
+ meta = with lib; {
+ description = "TUI Application launcher with Desktop Entry support.";
+ longDescription = ''
+ This is a TUI-based launcher menu made with bash and the amazing fzf.
+ Despite its name, it does not (read: no longer) depend on the Sway window manager
+ in any way and can be used with just about any WM.
+ '';
+ homepage = "https://github.com/Biont/sway-launcher-desktop";
+ changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.mrhedgehog ];
+ mainProgram = "${pname}";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix
index c65f9b5b84..7b58ede383 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix
@@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui";
- version = "0.18.5";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${version}";
- sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y=";
+ sha256 = "sha256-NE0GKQ3ROD+AF5FCuaKJ+8g+wiYobVK8swK0F9jo2Lk=";
};
# Because there's a test that requires terminal access
doCheck = false;
- cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk=";
+ cargoSha256 = "sha256-hO5rff3bm8g3JYh5vFhj2L3f/hOgP0ZA0EhO3YF5DFw=";
meta = with lib; {
description = "A terminal user interface for taskwarrior ";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
index ebc9b49966..2b4db0a7a3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ticker";
- version = "4.5.0";
+ version = "4.5.1";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-THVzurv1LB2lxGsCw0ZPUF5QLgtUfN4ZNp8ak05I2Es=";
+ sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk=";
};
vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
index 5e5e1bead5..ad43a1e897 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "waybar";
- version = "0.9.9";
+ version = "0.9.10";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
- sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4=";
+ sha256 = "sha256-KiRtU32h3AvThDWnCw55LnqbWVAZLXY/7fU1HxLMjLo=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix
index b07c526c0d..983f8ac1ee 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix
@@ -2,12 +2,12 @@
buildGoModule rec {
pname = "bombadillo";
- version = "2.3.3";
+ version = "2.4.0";
src = fetchgit {
url = "https://tildegit.org/sloum/bombadillo.git";
rev = version;
- sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q";
+ sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
};
nativeBuildInputs = [ installShellFiles ];
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 cbf055c564..f5965767cd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -91,11 +91,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.36.109";
+ version = "1.36.111";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "KKoMpMagq5lVoRFyWNs92LdPwNIlmAjfwqxfOArIFeo=";
+ sha256 = "bXZsUqLaP43wJV3Cehgblw1G179HgGhToSL36v5QseA=";
};
dontConfigure = true;
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 0eb1893e95..9b18590817 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -266,7 +266,7 @@ let
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
# Optional features:
- use_gio = gnomeSupport || chromiumVersionAtLeast "99";
+ use_gio = true;
use_gnome_keyring = gnomeKeyringSupport;
use_cups = cupsSupport;
@@ -287,24 +287,8 @@ let
} // optionalAttrs pulseSupport {
use_pulseaudio = true;
link_pulseaudio = true;
- } // optionalAttrs ungoogled {
- chrome_pgo_phase = 0;
- enable_hangout_services_extension = false;
- enable_js_type_check = false;
- enable_mdns = false;
- enable_one_click_signin = false;
- enable_reading_list = false;
- enable_remoting = false;
- enable_reporting = false;
- enable_service_discovery = false;
- exclude_unwind_tables = true;
- google_api_key = "";
- google_default_client_id = "";
- google_default_client_secret = "";
- safe_browsing_mode = 0;
- use_official_google_api_keys = false;
- use_unofficial_version_number = false;
- } // (extraAttrs.gnFlags or {}));
+ } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml)
+ // (extraAttrs.gnFlags or {}));
configurePhase = ''
runHook preConfigure
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 084db58f38..0202ead460 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
-, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
+, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
@@ -19,7 +19,7 @@
}:
let
- llvmPackages = llvmPackages_13;
+ llvmPackages = llvmPackages_14;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
@@ -54,9 +54,6 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
- } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec {
- llvmPackages = llvmPackages_14;
- stdenv = llvmPackages_14.stdenv;
});
browser = callPackage ./browser.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
new file mode 100644
index 0000000000..f2bf29cda2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml
@@ -0,0 +1,23 @@
+build_with_tflite_lib=false
+chrome_pgo_phase=0
+clang_use_chrome_plugins=false
+disable_fieldtrial_testing_config=true
+enable_hangout_services_extension=false
+enable_js_type_check=false
+enable_mdns=false
+enable_mse_mpeg2ts_stream_parser=true
+enable_nacl=false
+enable_one_click_signin=false
+enable_reading_list=false
+enable_remoting=false
+enable_reporting=false
+enable_service_discovery=false
+enable_widevine=true
+exclude_unwind_tables=true
+google_api_key=""
+google_default_client_id=""
+google_default_client_secret=""
+safe_browsing_mode=0
+treat_warnings_as_errors=false
+use_official_google_api_keys=false
+use_unofficial_version_number=false
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
index 3ea5dea50c..8341f2c6ee 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py
@@ -24,6 +24,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
+UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml'
COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py'
@@ -108,6 +109,12 @@ def get_latest_ungoogled_chromium_build():
}
+def get_ungoogled_chromium_gn_flags(revision):
+ """Returns ungoogled-chromium's GN build flags for the given revision."""
+ gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn'
+ return urlopen(gn_flags_url).read().decode()
+
+
def channel_name_to_attr_name(channel_name):
"""Maps a channel name to the corresponding main Nixpkgs attribute name."""
if channel_name == 'stable':
@@ -208,6 +215,8 @@ with urlopen(HISTORY_URL) as resp:
'rev': build['ungoogled_tag'],
'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256']
}
+ with open(UNGOOGLED_FLAGS_PATH, 'w') as out:
+ out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag']))
channels[channel_name] = channel
@@ -227,6 +236,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit':
if channel_name == 'stable':
body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8')
commit_message += '\n\n' + body
+ elif channel_name == 'ungoogled-chromium':
+ subprocess.run(['git', 'add', UNGOOGLED_FLAGS_PATH], check=True)
subprocess.run(['git', 'add', JSON_PATH], check=True)
subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True)
else:
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 f59cee7bab..33284faf14 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
@@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
- "version": "98.0.4758.102",
- "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1",
- "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6",
+ "version": "99.0.4844.51",
+ "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
+ "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",
"deps": {
"gn": {
- "version": "2021-12-07",
+ "version": "2022-01-10",
"url": "https://gn.googlesource.com/gn",
- "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
- "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
+ "rev": "80a40b07305373617eba2d5878d353532af77da3",
+ "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv"
},
"ungoogled-patches": {
- "rev": "98.0.4758.102-1",
- "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0"
+ "rev": "99.0.4844.51-1",
+ "sha256": "0rs10jrng63lk4xgnqpgc8zxaj6lp70csbx6r0ihpv4z3rdn37va"
}
}
}
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 c04b7f6588..d7b63fe46b 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,985 +1,985 @@
{
- version = "97.0.2";
+ version = "98.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ach/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ach/firefox-98.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "06103fa79feea876422843439c9d806634dcec91cc75288659df2597ce3a94ac";
+ sha256 = "92fe50154b763faba3d923ba19be737a7e6c48c04652275da2727489c0f3b14f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/af/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/af/firefox-98.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "1c1694e6a7b9460c009395fe69a388e38180fad1e772a3b25167bf883aad4977";
+ sha256 = "f086d9cf3142c7adebff590702f497e1f99d74ccb69b7001851e1b0329b9ff7e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/an/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/an/firefox-98.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "2209fc5aa9f128a04efc54c1f87ba7e29bb20410810d37cd7585896dad209400";
+ sha256 = "5e7e8fa95293bf2921596ecddd10217f10682e4a576b3f0f8c70021ee785afb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ar/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ar/firefox-98.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "540b8871c713288704eb50c3e6ccad4aa4633a6733e3a9bd7e6392bc37325a90";
+ sha256 = "cf7e5bfe6fcc19e0e6ac6b2646118e25b471cffc025d1de85ac62b0569582285";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ast/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ast/firefox-98.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "79791936785b296e9d6313616f0186ae4e1f79b0346cd2565315f55c6c43127e";
+ sha256 = "54c694772844caf3946520aa624d8a5c8d2d21ab29c64bc1c438011ad830d001";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/az/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/az/firefox-98.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "d853989cef9482473e20bfd45ca58028b1607cdb4892fc5d89c495d0f4aa3518";
+ sha256 = "0e342f5bc920684c2b7ae988a983e27e0bdf130b6f1e210952139edee2ea9827";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/be/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/be/firefox-98.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "8d0916765b3daef73af89d594155ab99cbec6d2c555bf2b98d77906cb7fdf02c";
+ sha256 = "89973f6718cfb63e43713594089618355e5c8323b3912a7a67d4d0fdfbe1cfd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bg/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bg/firefox-98.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "3a11ce5379ee46890cd4dbd870d3076848ce5ad842303798b577bb2ad9d06dea";
+ sha256 = "b7ea5573feb114ba63e5f0b516f36d134b4015a262c2e7f824dcce5cf31d7058";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bn/firefox-98.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "0092a295b61df555e4f217e13a8d2549c23931673cb811d0bf6dd970ee2dc5df";
+ sha256 = "bc4837219822c224b556c826f83bc913f9454da7aa9b26ff3a44119e5284b63d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/br/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/br/firefox-98.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "77093f532db755d9b12c8b325fd152229223cbe552708749b5c67a74caa2f0ee";
+ sha256 = "36d61c43e4aaf323763676ca5ac5be3e4c23af46b4aeb00409ca7391cdf60143";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/bs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bs/firefox-98.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "07e863a6cb8776af8142c03cddd9d88e7b9cc9f58d196c47a45a6e4026489b61";
+ sha256 = "6215685be94ad53ea827a6366673a14c327d2e4fc94fca51918b6cb2a8fb5897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ca-valencia/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca-valencia/firefox-98.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "a7c30b0f7c167a1b9ef11f1677355b98e88ec2ca5dbe029c1a61bdabf580aab5";
+ sha256 = "15220b2edf948b6027d391bf0140becb69f529565094f5f10a65b090456cc295";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ca/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca/firefox-98.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "91435687d154908d07fac68a2a916cdd21a31a50aab4c6427e5d00458137d5c2";
+ sha256 = "1060f9d8a46d078b3a1234116a2b963537213084e74dec8fc6b2598a8e863196";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cak/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cak/firefox-98.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "3a204dc9e8da4bfd7f9e5310c23cd0ae52ce4c4a7f3c1175ce6c76d0972ab0cc";
+ sha256 = "03a302fe8bea3dd231b204946cd843850526652ffd2b77b4110c97ddcd6b4f54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cs/firefox-98.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "dba92bf8ba406c2626422481a2dddc220d74a239b57ee40372d09aa4e7f513fe";
+ sha256 = "6815701642c6a76a3ee5f75433aa91d8e0e23b8a68c3f2204862703a4426fede";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/cy/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cy/firefox-98.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "15f83a6eb972193a25f382d500ea2e01a88b11e43a981c7e0d49396750c19e6d";
+ sha256 = "f68a21a0dd833f51a9d8e66e0c5d970b5d704472728e3585512d07fcbd28c470";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/da/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/da/firefox-98.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "0db23e6b132998e974749fc195043a457ae860163707b1bf0517a00aa1e57237";
+ sha256 = "66689f2a8ebdce69f3f83edf2e626017c51dfd823340a946e23550d93cbcfc80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/de/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/de/firefox-98.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6481bfe00c9ab3de1f6b374610ffe285bb58501ffa0b0779859759f76bb10bf3";
+ sha256 = "183b0453e691f33ea7844a8a0b4fe91cacfca64b07375d85a84dc58aa95fdc5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/dsb/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/dsb/firefox-98.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "2e717c2b79dbe0dc3cd5f76f9a119638964b8fe08820b490252f5e2c5df16e42";
+ sha256 = "b129086ca18bf18ab583015c2602710e7164a53bb262c8e3ecdc62092d88eed5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/el/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/el/firefox-98.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "9f185015367acf57ea80bd4ab3ce93cd468884b5995341adfd890ad7a8f79dd7";
+ sha256 = "46f9fc4b9cabb2e9fbee8a6453b7e5cccbed4dc7529717e917e4c3be3bb7fc54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-CA/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-CA/firefox-98.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "51605d1fbc4644ee6b13ca000cb04248e8ae0c63ccdafd3db5ed24e518f42cad";
+ sha256 = "5f7f255b6d210709f716920989f835f4908bdf02a5a2c1f9c12a393e03da6a8f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-GB/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-GB/firefox-98.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "2eac6e8c38348c508958940f9bb76dbd7c9de1426f3fb46d0ecfe9ed3de3e9cc";
+ sha256 = "a940242819cf79b1bd834520358e0aaea24e682cd5019668f356460a6815e4c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/en-US/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-US/firefox-98.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "ad296c84895b006ba555ab2cf88bdbe5c38f759dc3de3285160851a951017c70";
+ sha256 = "1a3d68e5e449faec50a427f709b98078bb57aee8209743a0beac978a4a72a05e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/eo/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eo/firefox-98.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "c7cfb29ad0e7ff34a5b7ca9df77a430133cc0e23ab343b81648b3cefc91929ed";
+ sha256 = "d070191b8184943b55c4a68a3b523712ab04b0781ac835ec1f31de5aa170782a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-AR/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-AR/firefox-98.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "1778407785e942b56767a5d44ceba1e64a6ba7610f2e37ce1b3c0d9006e8770a";
+ sha256 = "d5a3c016b4090b926710c184729f2a59af3c257ec8ba48dcadb6367f67976192";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-CL/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-CL/firefox-98.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "0980c00a7e3dd353fd62b0265c930219a0377b369d02223589451a950a5449fe";
+ sha256 = "c22546ecc83739731783c6090172b1a8ca9082415881d62c691a97ed27b0813f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-ES/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-ES/firefox-98.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "e3d0a16e79302b06dd4c5d5bca684481a4a8e23a41ac57b5599fdebb80cd28e4";
+ sha256 = "33a424c76e44d1ee73e360da08a5aca42ab30bdcc3ad2524c0c209be37121978";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/es-MX/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-MX/firefox-98.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "fac81aadfc0b53d4ee796369ab5f3d20195b902ac3712ac23afce07f252c81c9";
+ sha256 = "5ee32de772d925389210cd210c326f3aec85e9ad45b8041a373cf8456008b7eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/et/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/et/firefox-98.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "5e5136778ac41a749ecc2c3b3d9600f52a7384731d1210745baed8a2dd609b01";
+ sha256 = "3bfdba6becdc20002d267ed8d695b72915f4d59073f0c0c5c5858bd383189017";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/eu/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eu/firefox-98.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "0454dbe09d19df75d96f494c83ddc64a09ee56914edfcb9604f5bed1cc082dcb";
+ sha256 = "2c0669ed569b7676e10330d034802d9ffd24ca85ef38cff0208a7a02cba53d22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fa/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fa/firefox-98.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "4adeb426f43ab52e388d20e47de344da7e4b9510f54b6c35249154bad90396d8";
+ sha256 = "c7c8242892426c9cd1f0f60c3235de6dc7d9e77b3b341630c9d6887e34ff2761";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ff/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ff/firefox-98.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "59595e382c31d74b76436a0e9db60e2d387d0ecfa79e957cd9fa5105d01ac43b";
+ sha256 = "4a7352a86887d5200106ad725e7a41aab1d353547da2c1891fc399424112ba20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fi/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fi/firefox-98.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "79878a6fcc291dcebb3bbf73ddec2592b9037ab41daae5260eadc5da8450a13d";
+ sha256 = "a696aa3e201f6b776610195e8e0130791015229a66082e3f1240d925210db6db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fr/firefox-98.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "370622eb7a2a1d35f7564e118884ec9897a0af8bce74925f8185923ca2e3fa82";
+ sha256 = "67022f4ed56749d968780a97e1efc14d272a38a96aaf4bc55584e6fe423d48ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/fy-NL/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fy-NL/firefox-98.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "18b08369f2808970c48a7a2bb83562431ec983d1d8cc87238d67595475e91f99";
+ sha256 = "1718465d4a46d4e8b0fba79b9e0fdadb241183745ad158fa65a3f8d17212d7eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ga-IE/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ga-IE/firefox-98.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "82b9eb2e68d832f2494d95b583db9eefa0cb926843cd27ea26acb18f4d996f13";
+ sha256 = "65ea67422e9816b20be8259b5771f3db7f4c414e52cbc9975612a533ad4d6009";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gd/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gd/firefox-98.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "2a95b87a4779f6f978d86bc4e1b62b6e26c384dcefd591a9fc67de62dbc743bc";
+ sha256 = "5ba3f664ee375bf22255c5d9776c8da83747f52aea566a4436d29b91b34afb7e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gl/firefox-98.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "337be7c5c81988f2d14d455c9a2f1df9d70dbf6748f0e0935ab8c8adf478d320";
+ sha256 = "58edc93a8885ae6c2686a8c8f67b93b19fc99376155770b4e72e821d762be0a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gn/firefox-98.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "798c829b199f19a94a2133d1bd90d1f89d9250a5e48eddd48517964e7fe2511a";
+ sha256 = "c5c08869c3390a95de8e490af4e69783bba03fe8d55a1c2b344339cab9fbc4f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/gu-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gu-IN/firefox-98.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "48eae1301e522a180b8e3cf522c1da4716dc98ac6199358141254c93d2e32229";
+ sha256 = "35f29f0b0574ccbb02cf08d4714e2827ce364876ad7751ba7f1cc24e9f9861c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/he/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/he/firefox-98.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "ba205d1076d9a95333e4472f3f2fd904a523838adb2db8d9e1b35da9c3bc27c7";
+ sha256 = "27c5343c95f53dced72958155d7f8af100e3cdb8aabfebc3189f1a9c2550428c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hi-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hi-IN/firefox-98.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "813cf75f2362e0b482073591529eed3ecf53c96868c677a0b8643197725d6a69";
+ sha256 = "f8d7111c208a529c8f461284249d1c77f88e8d644c27f398aabdd414a7309802";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hr/firefox-98.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "36fcc3a5a40132658c8df595887875f84d10020b95fd45ae04ec7e5335625c88";
+ sha256 = "721b61beae502b2b7039e29b959c2b4b8cde84260b601aa29bbcf80c73a633f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hsb/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hsb/firefox-98.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "656d24f9b2c771f6faaa0595d67c1cac40a997248b13291ec5f1f7cf578c9448";
+ sha256 = "4eb192a2d3942e0c80ec2f3ba805a19824ab4c1d85e1ada9050409cf0cfd4ef2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hu/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hu/firefox-98.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0c29e97498fd60955c02cd231acefc9411b52c3d10ae736f4f6cda447cd3e08b";
+ sha256 = "70b9a67a51d3e61242c1ece908a81d0ce4b407bfdd9d3592a7025242cfb0ecce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/hy-AM/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hy-AM/firefox-98.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "0ce2b30421133e682058d38d61145839477f268f9b896d9c57d0355edcacaf84";
+ sha256 = "1135df2ba82e8834a8d38e436df2debab2601884c02a9ed876a64044dec9170e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ia/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ia/firefox-98.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "017d78f171e756108d4b19c620380f093b33cf6b963e3551e22ebfc89d3e3045";
+ sha256 = "0e8b652231ae2962c61a90466d1e8278c11ca3b4ce70432dd3a3541a7bd55760";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/id/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/id/firefox-98.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "034e4f54181adaf70a6732fe568c8e8e775a171bdda9bbc70002a0a23f49b9e1";
+ sha256 = "5c35d191e9010e7a0e97844b38573b6fde93ec57e13c1fcb85f3bbe595257bd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/is/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/is/firefox-98.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "b87b498b95ac5c54df7acb746518d74c7de7f66cbae0a186d20a433ad84ca756";
+ sha256 = "297aebec277c01bcc5dc0fcccc44946181991192e3f485ec4bc0555131f132ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/it/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/it/firefox-98.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "b90d484ab42c02f5f151f242dc36e4b83d1ebde15b87e2d41e809138a8f921f0";
+ sha256 = "7d0c7162f4c3c264d5394814c99881e2a39f9fd406e7a32fb5319bf63c3fe344";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ja/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ja/firefox-98.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "06167f6cd79dd32e4292e2ac1269386119478abc9c0d8689d8a4ab4785bc2ac5";
+ sha256 = "eb260c766f1c82d45393d5c7f3c3c945166f837ba02f061691bcb1b3f9d11b90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ka/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ka/firefox-98.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "9b1bddd0afcd3b562c48838027ca22741f03f4ee8bea2a619bdd1a086de6a1e4";
+ sha256 = "ce8f6ee46fe3c8b836fd694b2642be066a81191a9011e33c0853396dea625880";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kab/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kab/firefox-98.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "82490f5055e81a243172397fd370a9787aec2a034f73dabc8c0a607dd9650293";
+ sha256 = "05a282afed3bb3e573c4250368b3ff1edc4c322dfa81d30e8f8f3447199fe9c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kk/firefox-98.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b2637ef860d818be2e4fe94f520a4051813a0a72ab9c18888f7ff46d6f572eeb";
+ sha256 = "558a35d13332976880b0cacb69d45f25d72e34d4ef43e7c92260621dc1287ff3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/km/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/km/firefox-98.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "00377371bf242b579a38832d14bc0cb005a085b65bb1cbcaed95bea1bdf6e885";
+ sha256 = "a3d3f64dc5e55e9b3168e18a64b2bda9d238e10bbc295d7ce7f4c1d964b6553e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/kn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kn/firefox-98.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "79462373ac45c47ec74fd73ce6cb67124f2b30ae1536c3d089adc160809d4ef6";
+ sha256 = "b06d52db9c0e2984c8a652278595cbd0530512b9bb8e6d5ec5d3015620225bab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ko/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ko/firefox-98.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "6e68582fcbee036e815de250c3758d6f5f64f05a522263505372a71efa9b6a29";
+ sha256 = "f1edc7483429824478a9a4d2f4f3a03a9adf23e9ae364ce8c50da8d97fb55052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lij/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lij/firefox-98.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "e4c65f4dc771b0b82626db51388e048ce1685d0141e0602bb03b257a6c7e8a6f";
+ sha256 = "e441db0a47d1265d1280a60c592b4b2ddd33751c1e9b38bd71afc2f25edfe469";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lt/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lt/firefox-98.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "5d27f70cd772512268f0b2e0375732899dba624aa06b8fdf7991870e960323cf";
+ sha256 = "989c66160ac78aec5a4d543a519e11cad772cbbeb6b5bd30832b04751217d621";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/lv/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lv/firefox-98.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "3481e2f2d6eeaac8104a42557bbf81099e83fa1f6fae83faec7d98c54def051d";
+ sha256 = "764a3821b57384676d1236e9553007a78583fd277d27174bf4970750ecbcf9e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/mk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mk/firefox-98.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "876eb0ee59161f1ddb72510373f7050883cce63d99ce167039f2d6da6f4bfd16";
+ sha256 = "104b650e57a1d521951086fcd337a21fb3133358dce8842c434089454a389f12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/mr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mr/firefox-98.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "213f2fba8f6e9421c1b818b32f9da7608545de2c9a375497583cb7f3fd7bb021";
+ sha256 = "396359e41e9fbbc03a548e6f77c1a607af0e3c09044d6b57e2cb01fb80fab94a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ms/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ms/firefox-98.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "f55c1c63518f027202d12e9631980b8592ab7dc9bf69bedaac615d21bc54c93c";
+ sha256 = "e8dcb2af15e9fbedb0e3ebdfabdda5f596fd469b6b20e4b6c5eaedc177e6c7bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/my/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/my/firefox-98.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "7d280b786459220037395d140dd248da4c5efb6b7ddf5dd995e15c190103160b";
+ sha256 = "89e64cb715720dafacbebc7ddd72a5c6cbd69995113f1b7d1e68805b09591df7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nb-NO/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nb-NO/firefox-98.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "4826da52357f84c1880964c0c387a83a178fad365e427a80e14452a8914116a2";
+ sha256 = "640c4b9f4e23d08df22d67e915cae12ba07aea80ef392658f693bd5a14a23572";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ne-NP/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ne-NP/firefox-98.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "d1f51d93f6fa8d0d467ea85331e4ddbd3b485b6e4629c26a9a3e4347db957a6b";
+ sha256 = "efe07ad3079a3295744b8739d3718374137ee98d39622c0056f079196175dfed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nl/firefox-98.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "a6092114a7d6b58c66874ff1c77c155d2c248c8574de210cf4111587a4c1e21a";
+ sha256 = "d979a5e416109251b0f27a50e5d2831ae2fbf3da6ed3d3e34b52adf2c19221ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/nn-NO/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nn-NO/firefox-98.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "22bed8fd59c3138be2e0c32bacf3ea4c270c911bb13b269903689c6b44b92f24";
+ sha256 = "cdffc971080f506d083b7c4fb1edb769046a6b56ad5c6851fd3a09b48d401bfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/oc/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/oc/firefox-98.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "4f932b1ef1689f4c3733b47176d5f1b4ff7ae3ef0e9448821be5ba545a3bd80f";
+ sha256 = "7d4206e9e73132f13f5ac5377eb619c796ab1088f8a91958dd13789b0b309995";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pa-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pa-IN/firefox-98.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "ee8ed5b62a3af8693bd9bffcdd371e214f1d8e8d8f027021fe0dd0ced7febbc1";
+ sha256 = "f46a2e85222e39c03019373cfd539ae5354c608e60783151f15bbdd1a8be3b62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pl/firefox-98.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "1030e47fbe9b56d411aa7479645467a2d7d69d2547785723ed6eeb71287de855";
+ sha256 = "1853fb827d238af7122e9edb0d7553aab00196f5523addc641f93b3f26b02b0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pt-BR/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-BR/firefox-98.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "677c9c2320e5c76b906bf45af9af6dc06ab6643d708842d5ec53be7879e410f1";
+ sha256 = "a5f4e7c3f0b187bc86c4b085536a8dddd9c2fff6f746db77ed186b6ccc4efb97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/pt-PT/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-PT/firefox-98.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "713454c171d909cb25e32ba5e2a9a5402b268462440d3d1c6af6c381aed81dcc";
+ sha256 = "88dd8f0332d88ccd38ba119acdaeaad4fa3692b45759762871fba67a110af9b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/rm/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/rm/firefox-98.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "e5f32064d6466cc063f42ca2a8aa71bad1c8416296e43aab51ef26483cf99e36";
+ sha256 = "7e901202cb7b29f04c481df5bb330faa92e48d41dfe49ab614f089c4787ac36c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ro/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ro/firefox-98.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "029254291c06bdfebef637336f3e369d1225698890deb1d3a8f1c22af8af96bc";
+ sha256 = "149b39e24f83bd14c9befc52ef92639ad02ac2059a247d8521a8e5f8659b0983";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ru/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ru/firefox-98.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "cbba6fbd7badc80ea6c027567197931c1ff0d0954bae7afcfebe1aba8ad1a5c3";
+ sha256 = "5739758546b279d77101391edd7cfe236ddbf69434ea89dea6c5d4f857a016e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sco/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sco/firefox-98.0.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "42c7008ea400a4d0459dc640d62ffcd53ff7fb9cab4ddd2d256fd5d904e7a9d1";
+ sha256 = "cbb408a2be5d3c15ba7f9e865c02228f65c9ce59d2c29dd081638515404da03a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/si/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/si/firefox-98.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "2a1f68f377b399effa9ce5bef552999961f65bc9811e348e67df8219b1f8f674";
+ sha256 = "b96e1604af6e1e828230a1a3652f83bdf28247dbcb9961b233d18a9bcc829da9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sk/firefox-98.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "1b8a84779f43505eba914c8200bbd081fc9f8733349b1a1a111e841143a17b59";
+ sha256 = "ebe0774a5872e8e9f3ed3c894d10dd9aebcbce1539e56febcbbb7ee97c3ee358";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sl/firefox-98.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "4bb3560dfbfeddffe123daef7feaf2cca07fefd61165b73500e10fc8b5b19725";
+ sha256 = "2b3e38e812508438768d4f12e545d96f1b7e160d53edd26481ff70510d89388d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/son/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/son/firefox-98.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "7e34dc2ba0ffa089f2a33e9a03876233aa229c3dd196a13d386fa2809a75f0cf";
+ sha256 = "df1bc20d146bdb2d1491cb040c4eaac1a70d4af024a00863539b218b6e1098ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sq/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sq/firefox-98.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "b463cf0e58785d24e1afe41ddbcac913fb8c6d1183d0a42fdebe4c3372c1ff77";
+ sha256 = "9b40353c9c9911522fa495d35f19764b220e2c40488205050719c951911dac11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sr/firefox-98.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "293679d7963bbbcd56388076eafa71a8642094826cbd0852c127ff2f6f1af6e6";
+ sha256 = "d2ba0fe06528af4fed9907870bd72290df1c433c02bafad8b7b834a24b9a1427";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/sv-SE/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sv-SE/firefox-98.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "76ea065441b99bf4fd9e19063161f46d553720353a301e207dd2f2a4aec68d8c";
+ sha256 = "44fa731f57d2f0639d1e3595eebeb2491cd3dfff7ff8144eac663e966ffa8f6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/szl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/szl/firefox-98.0.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "8098c6ebc375223a64b377555634581d9674e8122e8fb35ffbce4d168e7d2cc1";
+ sha256 = "37523769babf48c7c942d878c8c55bc0bd761a0e4df8a0d562416ccff46f8cb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ta/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ta/firefox-98.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "65a9903767a0af7315bdba205c4f5958b6a8b62667b47c461776a42327034f25";
+ sha256 = "3aa9dc19988fb6663ac95b6c3b79d03313cd78cb4e80700708ac92c3939d513f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/te/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/te/firefox-98.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "c472245fc0fadc10317f6cdbbfb16007241ac88629f89fc0140ef13d86a34823";
+ sha256 = "bd7a1af00c7aaf49c5ba667e7e85bac5672384b68f5f7cb96e4670f7363ff063";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/th/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/th/firefox-98.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "45bbe61e8dc4c14845348d9d27c1b9936d6457ae2f8d3e469bf89d948571a54a";
+ sha256 = "962c9e428f1ab3d3d143920a503dcf6d5335489e7e691a4447c32ddfad0b55d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/tl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tl/firefox-98.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "8eab5ba98fd9009016063c72e6bb2697a35144057216d783f68f25bc7b2cd95f";
+ sha256 = "6ae919a932170ccc3891f0805949e29cd403f6a2e6efed38b76c7817c9533cef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/tr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tr/firefox-98.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "3353d52fbb87f2153b47bc0b7418b59c7a69c9fc485317c798dfb46c22576b25";
+ sha256 = "27127d6261975f62185966a8d2a9c4e686c92212b8f4e06a36b47d16434413aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/trs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/trs/firefox-98.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "128592aeea8f05a45de19775694c6328348c6e9c379c87f74d3e128f6d2f24c0";
+ sha256 = "a005665c64968a82221d6332ed20aa6702f197ec31960fd4a4a78871a947586c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/uk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uk/firefox-98.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "8b6dc07b28938823bad837c4afe35974162269b18603558922e5cdbfb8803e77";
+ sha256 = "866021efaa23457b203bb2700b8f24649222855d7ac1f71bf05ee98469f8c7ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/ur/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ur/firefox-98.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "55cd1f091e19393e20286c841391276518f5052ca276212f7fcee131cb8afb8c";
+ sha256 = "d34a0c4f6937d8f6375c5d056cb615db37673917dfafec7d1f5201c38359a1c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/uz/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uz/firefox-98.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "2e047e036591bb43e402bac8f2fb4c201ca20c98954516899a05a1f81fdcfc99";
+ sha256 = "a5098a02bf4a8c983e81b2863afae1cccc007c69556d69432577928a9eed89d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/vi/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/vi/firefox-98.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "5f7f76c7c18697154b42de673d73536c5f464c31400c40d63ab21fe63b0a3f3e";
+ sha256 = "ec7c91879c348fdccbe73b498757d1ad7bb1461df530829012c33c706c023aa0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/xh/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/xh/firefox-98.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "9242eda24dc7f713e271c2d510ff0b5b6b9b4245f52c61c854ce9027ddf0aaf4";
+ sha256 = "0b8bb8c5eaf45faa1f128c08a8d47d7f1388f37e09f73f3ee9b0e77044aa83a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/zh-CN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-CN/firefox-98.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "d6747951a775d94628e132ac6ae4d42be832db68b8acd37e88a6704265f96492";
+ sha256 = "4cbe5d68f610f3778be063d132271fca35ad9c7a7914aa32459527b4c1800948";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-x86_64/zh-TW/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-TW/firefox-98.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "0696bf38ecfc74515125bae5e78488d3791c96d278e13a945c8fc4ef22f29795";
+ sha256 = "80d4bc113d203fdba00f6af11ef1fd7b9184204b1788124e66049ca5ec13b3c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ach/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ach/firefox-98.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "2192bc876e5d20d07dd7bce8b1cec0a7de9fbc2792bcda0cda56f4e6094f0780";
+ sha256 = "98a4025d0771980dbd3d06511ba15de71d7df7311c7e683039d315bce7dcb590";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/af/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/af/firefox-98.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "cbe1617bc50bad32cdb5d509ddbdcc06ee29446b4aebf9f7ff43b76a3c397c80";
+ sha256 = "8519234c67e0f8b4e13df38ca98589d0a618f607eb940cf1f686f540a3dad527";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/an/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/an/firefox-98.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "cf8fd1eb1381e799c691bc29e7ffff12d7b680fa3e581e74450c4299b96c1f12";
+ sha256 = "61bcf050289a12e11c6a2b308f3323f39558aceaaa7b18cd95dd19609065a66f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ar/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ar/firefox-98.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "e9c2a210cfd311a4150e2b669f28e2cd402f90e3188a0025a6c10784ecb599e0";
+ sha256 = "961d7585e36e387d7a0f01bec3cb8359704a0716124211f2a24f5c046d49d338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ast/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ast/firefox-98.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "46f6fad024ae9f936e87817ef8c412b5cfcec136bc20b81711999f3d0fd80f1e";
+ sha256 = "bb104056866e6518bb0ab94ba179b525105ddba09fc969065dc48d15f70de5cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/az/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/az/firefox-98.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "e949fee909684137ecf11d708d7792d567dd2626ca85aa65553aab798ee22158";
+ sha256 = "897fe5ebfd497eadda7858701217d6a0cf0bbf2a74389ffdfc46ddc8a5706480";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/be/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/be/firefox-98.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "c722c2207d3c517d3990b9c391279c8edf64c8d2580a9aaabbeaeda068187bbe";
+ sha256 = "6e4122643e4bd368c7adeb640554c7a5252562b767093aeb0e9cd63c9a533b25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bg/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bg/firefox-98.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "9d160390573d2fbe8bee16fbf02e5aef8b39cdddb29b4659d62d8c4cb3b7ca9b";
+ sha256 = "481a3cc57cdd62d1ad23ef9f8f0c15087ff20335ab57bc28729dd74975460370";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bn/firefox-98.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "07b43530c11a8c9dd17d2add98e969543e3de5641480d8598c8622a30b8d0c9d";
+ sha256 = "d56c44b8c5103072605b9fd3e5cec63ef613698bad3198543e67958c7ae2c97c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/br/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/br/firefox-98.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "d4fc63b59f15a19f1a8096321f97250e2c62c545e1ab4376e00dd37bf926358b";
+ sha256 = "2f25b1130142faa0efe08413512353319dd341d31221fd463f198ff8ec776b4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/bs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bs/firefox-98.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "2926112d25fb8b539c64150182c871925442624588214428c3404e172408db65";
+ sha256 = "a0a33294d9eed0867463b56bd0e02e58836c5eae91718ba918160dc98eb7ac42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ca-valencia/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca-valencia/firefox-98.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "84aa8decb3de692e7bb0d0ee81776e97d17ca5e5d7acb26e40974864edd97749";
+ sha256 = "fed1ba8e292c72cff4c28ce3c5e59f58fd20f25624444084394f7b1cd61446e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ca/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca/firefox-98.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "c3d5e497af8a54aecf3759577a84d0f3653f7a23482373e76c7357216dcf91ab";
+ sha256 = "f2cff173d6c5f6d12f8b29f07b3ee0d51dc523d508f340a65a99404953e1cb74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cak/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cak/firefox-98.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "a6c9ca50b2736f938c083f77256e535f0292c1185f9953de4b85f96e38319cbb";
+ sha256 = "c48e7d51d10b4d398a3a737faf204cd695091da360a70f3fb6dcf8b5ddcc265d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cs/firefox-98.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "09d99e99bf9de31352331fc8785b0b3d3780a2bb3b204040796cf97e5d122d89";
+ sha256 = "1a223fcfa992f1f58e61f9c4903253e51adbf8a73380d09e9b38eda8f713c31d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/cy/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cy/firefox-98.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "49e60a72cfe50cf5ab611b3ad8f138591450160846af4463932786885af84d6a";
+ sha256 = "3f26e158ac5870fecd94d2b5a07f7116577fb0cacae5a98f456aa64b66eac64f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/da/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/da/firefox-98.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "0ee8afceb0cbeaf073ef55c11ba689a150c22b3d0c2f195cb229faa8a9b5b649";
+ sha256 = "1ad6bd99e003d2c8a2d3dfb15360f52800b8e2b0c6ce586f1857ab491763a27c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/de/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/de/firefox-98.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "e26b2d1eef2534cf70d4f179fd0588d5154499a8a24103b214ac12c0b5a8c8cd";
+ sha256 = "1f433c261278469c96f239c595ccaeaab2d735b461847b2a6f0770cb618e13d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/dsb/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/dsb/firefox-98.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "aa18dd0dd29922806a9cb5898b4c96288cbab93f167e811a9dd3c74932078a08";
+ sha256 = "c0aa0c513549ddcf73243d7b0fec5110d547be0536b79d2763714447cd80460f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/el/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/el/firefox-98.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "c716a804e8b2742e9c429605239857243776aa659c401faadee69768bd0291ab";
+ sha256 = "0e341f6e22862bc0d92efce71243e64cde6e9324ac33bb1fbfed59b84fb4fb89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-CA/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-CA/firefox-98.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "eccbac7e72e1e71e09836e029d898e8f01edf38d32cbfaf40012891cca7c22f5";
+ sha256 = "5dedc5db801b0f7c7bc42a2373e8558895a1fc757cb1f39f99b355729eff7e4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-GB/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-GB/firefox-98.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "9373ba9afc767b7d52e3f7183250fa315315a6e845b9700019509d2f623f1341";
+ sha256 = "05d2a3ed1e9b2d7693062758183187d0a8a4524d6644532029aadb1d2d1b9548";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/en-US/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-US/firefox-98.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "6d2457c5d25ca4be784d189deb3134421c2072881412a24f732d2853b86e0bef";
+ sha256 = "01e9e15b89299cac4ec8931e84f11ed63ff3ee5e70cb73be4cb6f6f5d817cfb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/eo/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eo/firefox-98.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "4d0e02741eb10eccdb9300b0ff6f13674a74bed47139cd786e9bd7e4315970b7";
+ sha256 = "121a736e78d12f984270cea37b14915fe65a52c3dfd29e155f20a09707d69c58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-AR/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-AR/firefox-98.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "6a8c963e0860d89a829aa27acc32fd2f79bf89cf87534c837bdcdcd9fb5e0157";
+ sha256 = "a051af8c255954d2c025cb9d3a0ad2d1ad6bbfbc1bf69436abe8ec6674277ece";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-CL/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-CL/firefox-98.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "8472ac2735d2142bc8d465749c247413362637a81d57d68bbd15851fbe05cc2f";
+ sha256 = "17a2fa85675f5fbf532da3485099315de98397e5286e2fa5a0b1c8b468a9c974";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-ES/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-ES/firefox-98.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "922d5e41d37b98226a2969ee51079d7ab584c9522234188a97c9aee1feb31f27";
+ sha256 = "ffa84eba0ac4cd45fa385de6fba23b8bc69efbee1a3bc39b7e1fb95cf6e6581d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/es-MX/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-MX/firefox-98.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "082db8cff7aa39fead4764f497ea27eb43f761928d5ab6602032feabae599a74";
+ sha256 = "f73059f6dfa6df82282ce8cf5068fc5fdbc6320d2e73c981ff6571afba8b3959";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/et/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/et/firefox-98.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "22b7484208ab90ab3c145e22688f945764d7d2c3321577a8eae339f6a385dc09";
+ sha256 = "250eb95ef69fa4e61fb6fff0c10c7f884684ca428318b1feed366a2b49809993";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/eu/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eu/firefox-98.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "25ffb27b43aa19b0bbf7cb8205a26744804d9ad995c05121c946bbbf5a9cd426";
+ sha256 = "6a709d754542a74104539e8e043f1b07652e007a1c062e067af4123d46c46071";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fa/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fa/firefox-98.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "65b842820b27d8c721d00b20fe349b7143dcf512743ef24792346be2945196a3";
+ sha256 = "5435ad7aff621091454b61f2261e72ef1ba2fcd2b89d32148f8ffde0635e237e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ff/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ff/firefox-98.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "c48993b690dee9cf52cbfbc1e9dbe050a7a09cd31a0351727e761232f51af521";
+ sha256 = "627f8970b92f5a96d8023406ca14c46471be457147d282e15e71db0163822a66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fi/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fi/firefox-98.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "b2b019f93bd46e7fda9f9bb587bac5b6fa6933a8a438a56651c1b357a1422ead";
+ sha256 = "ef7912a562f3d01e20ee54dd505859ec6da549c8daba04c5003a8b618af722d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fr/firefox-98.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "55f34a1298704c4e35bf3bbb6bfe5ecd723a2266cfa326440a53dce7800fa4b5";
+ sha256 = "da5b3dd660ff8ac8f10f5419d0d848503a74948d76ebe45fbf88470703b24831";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/fy-NL/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fy-NL/firefox-98.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "b24917d24a66762f190bd3de0fc4c3063bea6b8367bbe0cb7179a0403dfd34aa";
+ sha256 = "5d58c3ef8e75c22db07e82131d6773f8af8930d46a3ea9667bae07a59dd6b8bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ga-IE/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ga-IE/firefox-98.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "8b492d36f0031705cea67d6862991f1a78ed2678df96f7862b97f13f30b4f7ed";
+ sha256 = "05a3402a6be754390c79a66160510696acf866002225a5d242d2f178e3c63dc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gd/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gd/firefox-98.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "3ddece6e94a6ef0c26f2204cc5442a00f5bc4aacd3bd87b2f4085aae5cf6d519";
+ sha256 = "6832439565a3a18ec623c5a6d0c36e429b2ef291bc8c0152da6934a108ca32a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gl/firefox-98.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "e0aa1ea385d06324b174eb534744e16293e9e2a9ec67448500f5f85c1e78cad2";
+ sha256 = "2e55dcaf24d4fb028ff5dcba94fac38499897bbb7cecca79d6fafc0b83e21a9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gn/firefox-98.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "e36c9a22f3bf6047cb8d697b5e1e9cf23b9074d916dc7743653d9126c9315eda";
+ sha256 = "c25a77b99c022c3de29cea922e926db9e738771cd146acc6d71545cf8f1acdaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/gu-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gu-IN/firefox-98.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "ee328a70d051a7abd6c2d9ec7654eeb6b53dc0f30d109e1690020b246c7802e8";
+ sha256 = "e41991d388c6fecf9b22416c5f840e8f96d032d3be793101c9133ef7cc545850";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/he/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/he/firefox-98.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "93598f5edcc207eb20796c52629eab98a9422f24c2788a65dd45c92498352123";
+ sha256 = "55125f1e56fa6d8f5af4aba206e3ede2bb80f39414563a541f07eebc568de993";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hi-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hi-IN/firefox-98.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "9c86333eaa06e03cdfcb3b5e2b7feb5f740825fc59a1b115b7a9180c5cdf71af";
+ sha256 = "4ebdde0d91f94399607c127953e738855a17463cea34a4360b630ce0e6add5c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hr/firefox-98.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "1b067012f8b23c0ecbf0dea390b8cfe7665a584abd3d5b2dd5706d45de2960c1";
+ sha256 = "11f2449791c1613394764d36e1661cb05a83e2582904eb00ade9f09f58d4147d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hsb/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hsb/firefox-98.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "1b0c71e9822b6a61704118bbd20111f3350389d8a12d52b3932383bf85f133ff";
+ sha256 = "d7138688ce4edd030bb51d7eb68626a4055ef18dfaf30045d872c03b187b4ed8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hu/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hu/firefox-98.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "039aec5700c4c43583637f331dcf18ffd7be59884804908a7cfe85c29030d626";
+ sha256 = "693e08538b19f9d1aaab399e8d4b582e557e34ba5d2cae7de6c7e048b175dd3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/hy-AM/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hy-AM/firefox-98.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "0edb9c11fa2e1f4c0f73c259d8943120e7f7ffa88b31bfcb796543b7b9e1cfa0";
+ sha256 = "1e78ed371f092f9e1ec9ec7c43b16da6b5a277056983ea810af568e250c9d588";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ia/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ia/firefox-98.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "53da2a2c4b3c952ffe14915fd984342d023e0a01f348d41bf747f2e338b05798";
+ sha256 = "a02a62a042cc51d7b6389366114816daf10cead0ce51a716ff58485fd7b856e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/id/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/id/firefox-98.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "18b9041709dcbf3209e1527a5d5bc0067ad8eee6031dd76ea40d4b88908fcc1c";
+ sha256 = "e548a304acb9075e6110c276482a1759cfb06b6cbd4edf2b7aa633f6762b91d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/is/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/is/firefox-98.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "037eb31ed338a220054b223f875f58c020178da7b06dc93c89e836010a5ac5cb";
+ sha256 = "c43167df2a3739d7d9e7c8013cbe4a9ed5e18a060d06667ebf36102ad7a0587c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/it/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/it/firefox-98.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "f224b94d31507276f2bd220cdc3bb476dd6aff5f50afac5c57c0b1d42525f08a";
+ sha256 = "4eba45221ef34d71353b3d442e8cc5a565fe79cad1a21b4de27129da92f165fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ja/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ja/firefox-98.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "4856c05bb62ecb086b2be18236917554f0145374782bf03ee32e13ceb669664d";
+ sha256 = "173c3f7afc252f495e9553c6b7a1afdd5090de2578a477e15307ccbecad937f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ka/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ka/firefox-98.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "bf42c9959f08650090525624cfa6e301c8c08bfc3f112ab39362b7729ddc12bd";
+ sha256 = "de14be28830076b11610a8824cf20e161cb4e7c0e527d160caf7d214f41ba9a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kab/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kab/firefox-98.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "8529eb80d70cb5a76482ac742ef3336c754e733d9c9b7cb80c6b9193e4a26983";
+ sha256 = "385dfe3ea1c1aafd4e0f3c4176bf2498876b34d7fee5195ba5fa5884203ae338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kk/firefox-98.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "9a4148fee4ef601129d0d76733d94efba0e1fb69daf75f12243ff687852425bb";
+ sha256 = "c9b2f1fe4cdce853ec155a4b99d44279dc64c266706e58274413b0b37cf71317";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/km/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/km/firefox-98.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "4106ef9adb0ad0333a551c57c24a5a1a1c13d912d8ba4524ac0bc95e87ecfbf8";
+ sha256 = "adc84f8768a71d7f2ed314dad0347a346b3592d47bb7ef621301deb2b72f7f56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/kn/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kn/firefox-98.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "5f6d6d22ba1ac0e0a9e74fc2299e8fc0f0329fcc9a814dc5807fa80e6870fe5f";
+ sha256 = "c0579f13e76c62e402065069ab7dcbddd7cfbea8e428b5bf2e77d42550d18557";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ko/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ko/firefox-98.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "e03e8c645a98277d8a7d9e49dea8ee35bf574e331909ddb3f47a113834e0fd63";
+ sha256 = "bfc610608666e626715000bc4fa48dccd43ce0036ee0111e926f92b75034a0f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lij/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lij/firefox-98.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "40f5caa8e5393c6832632fa8539c3c8859c05b96bcebfd7b098e81020bf14c6c";
+ sha256 = "fb1afb37bd4d47aae8de6ff8b1a2dc34d41903ae4ead5a2671baeeb6ef3b3196";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lt/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lt/firefox-98.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "5750105121d1f2c3192407c9859c5bba10fbae70b79b4dafd03a5fadd7a582e8";
+ sha256 = "0197a8c4ddf84ac38aba0533a84b4a57e783d3542b48e221b3317b39e9decddc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/lv/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lv/firefox-98.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "201027627af36b8062352d790255952cb3244a6d4ec50c40e70375fcd754fa6c";
+ sha256 = "a7631d6bfc46a140c226cd1914074084ac1bba0104c7811305d40291e015c2c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/mk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mk/firefox-98.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "fc67d3f4524c50ccea04ef1d28d1850c8ce732df6fd80208f3b95d0f5bc97b13";
+ sha256 = "78be93a5ef3ec79c9b7b8ed4134b25fd66db74e4160235e1ff57f87f7ecf7f71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/mr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mr/firefox-98.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "a966671ec7ff2f880557f4847bd652ba98aaa08ed787755ce88ea1e80f2ed06e";
+ sha256 = "3890be73f978299ebbd3c7ef0919a6d5f916729528ee90f7d1ef86b088fb748d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ms/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ms/firefox-98.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "82c4358c9df915d6757fb2935289218d88083bae677881c883d6b626aa3b2ca8";
+ sha256 = "5bbded06e5eb3c4f628df573ca10aed952d72125ca1f96f74643e28210121e47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/my/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/my/firefox-98.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "91d6c81aaed53c8d218a1fea1c440aec8850926c53a994b7e4efcafb061daccb";
+ sha256 = "2a8ea9468c6fa4a4a303c4b5b1a9306898ed8f2fd60a3e8c9915ae549baefa09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nb-NO/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nb-NO/firefox-98.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "d8773597a84212cb0fdd6555fd358dcf6dec7d97db9a6b646c083055b13765b0";
+ sha256 = "c7fb5c534a03afe15bc2c439b679dbf3316aea92d23d154b6902893633fa9b32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ne-NP/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ne-NP/firefox-98.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "1027a001f4586cf6dffc85e8fd7b9e8e7f70eacef30198b8a6bc8c5b70d1fcf8";
+ sha256 = "d2b2731732202c4501e0989fdd95a68cca01aa4b13a02ca035247a1de7a7f299";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nl/firefox-98.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "0add3e6e26b51bd8363b577f7ed09395710304dc44c9e584af2267d855d4584b";
+ sha256 = "2947d1783e0cc8126c086bb9a1ed139de735ddf2bcb4f104e9efb6d68d844503";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/nn-NO/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nn-NO/firefox-98.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "1c666a04b8ec8dad7d56d9390a565e9a95d3668687e348cd83a4e9c61d76ab46";
+ sha256 = "1aad31043951d9b81f707cd9c6259d6c215ae20f55776719c2553148dc3bb589";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/oc/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/oc/firefox-98.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "c1ccfcd6bd1f5e9cd5713cc70eaa852f111311c4e6b2fdafb081d21c5cfad8ef";
+ sha256 = "c237cab50aba2e059224d80ebddda67f13f8737899a29d6246418dcb09c486de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pa-IN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pa-IN/firefox-98.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "17d4aa8cbd8915ebb36f5e33a61c21ac20c1a22804ebbde9af1e23bfb97bc8f4";
+ sha256 = "e487db05bc46eae01509b5ac3a9f4aa6e3cd8bd0970366d9501c1a74653f3110";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pl/firefox-98.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "045e39e9b4b5a8267ffa61aa61035fd9b8072cb5abe1c3bf55b5962ee5c187ad";
+ sha256 = "a84f34fd417855acfeb89926fdacc8c4fdcb870251d3b43095e04d2392a6637f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pt-BR/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-BR/firefox-98.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "2fedcba08ee5bea1e3b96c2f505f6c8005858db7b3cab323c1af116da6d6baf0";
+ sha256 = "5a4e35c0efdb79e83d535b62d57c26d5021d20c26d2654b98f6078ebbf4b6094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/pt-PT/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-PT/firefox-98.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "8eb62212fe9dfe210106d4cb294c9483f8beeefbb1a71043bea0d615e164a0de";
+ sha256 = "f61b70f911e708f4964f4592e9b46c8e70a730f778aaa6e320ee7c0d3647253d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/rm/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/rm/firefox-98.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "251a08a9662aa199df492c6f8301e888ec49bba30b36dfb4e55d03080796c69d";
+ sha256 = "3b602a6d897e2311f1521a36ffc4be4c6b84705605aa1bf321b684010c02d59e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ro/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ro/firefox-98.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "72255f3acdaf1f519c2dbb644c3b6ad3686391884bca4babf5d16e3f42664b5b";
+ sha256 = "94ff92349315c126c3c1294e9d468914b7f81ef8a0597c5fd039fe66bcad271e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ru/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ru/firefox-98.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "47cc1e7e044be8c8e23d5398932770352482468eef09a7981de792bf63d5636a";
+ sha256 = "1f24d74427e79b7c78ffcdfbe1a40c5e767ed0854a870babdf1f4956ddaa17bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sco/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sco/firefox-98.0.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "d95ff1e2a6ed5dae1bc86b54109d32cb70997fd67a5d2509918acf162ad0f575";
+ sha256 = "2b11f6b4b380143ffb07764c6fb6fb139da7aaab0ea5bdad826b1c14eea09a3c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/si/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/si/firefox-98.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "1babc4d0daf943eb83bd0b6cec67f5fd82fa9014efbd1d828c7ef89055645220";
+ sha256 = "f644c5fcc35bb8e4a2d4ba1d7210cacfa498ca9aaed79174ac4f973021dbac63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sk/firefox-98.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "fc0984f13d0a01ccd17830855ef2c14344dc0d51d60c7660dcb25c4d8cc6c9ce";
+ sha256 = "859bfb3a177429a24e585e6ad11fdf9220d5d0a2751ab861aa33e3e553a3fa2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sl/firefox-98.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "4978ff29f97455bca143b1b69c1da4edfb4740734853c51ed040621bd04d7fd1";
+ sha256 = "e5ba078d2f83df37b8211f8423dc549358b9d1c508a9607d1d5e735501ca9845";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/son/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/son/firefox-98.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "e391df473e4711ff30c26fc3a6069f93ba7ebba7681350ba932c2af443052b60";
+ sha256 = "07f902640b9742954ac03b737fd402d1024e647d4cfc096ceff2ef5329853235";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sq/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sq/firefox-98.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "d2cb665ebda69305e9294e7f59c8321bdbf6995ca12ee0cf9730ae832191b6d6";
+ sha256 = "2dc1cdc47fabf4d212745f326dea7ad202527fa8dee9d90908812a3f7b152840";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sr/firefox-98.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "bebc7b77b5b3a4f68d0a65f0901f4fe3eab30c9d0c17511de1c4c16224ce89ad";
+ sha256 = "d84a3a521ed43b9ce70a6984f6afb35bb02da5b4b9372cfdd47607151dbfdce5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/sv-SE/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sv-SE/firefox-98.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "6f70d748dacb0847197dd4b513a41056db6b9cdfa09cf05c85407f54c73bcffc";
+ sha256 = "5c313719484370ac42a46cda464ef5096e866a93d821fd88d8cadc3fe483b8be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/szl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/szl/firefox-98.0.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "691d0d47a0eeee2ead1b4ad6d68c30f57f716606081747c8e318fc6d124f52a7";
+ sha256 = "6933fcc3ca447d2c530bc4d5a3fac65351359de13ca8415c17034611d343e4d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ta/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ta/firefox-98.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "799399db843a096b0a26f916662b774347559fc1e22f2763b89a409f346d859f";
+ sha256 = "a1d11f11350ad8a1aca420774896721a71db6640e78798bd5d0e9563fa215350";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/te/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/te/firefox-98.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "9470f20496f2abc22da792dfd2dceeffc1fcc5a7cb94c63478f784ef3ffe4718";
+ sha256 = "a09332149b4d4daf758cc75a0b50c793207e6dfa7f487f04864f8c41e2f7c2c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/th/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/th/firefox-98.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "9efeeb40b74356e5c6a9c44b702fead83c29eea0782964024a8884f22216d055";
+ sha256 = "615300bf23c3903079601c5e4d9509bc3a7d5fa1e94a01aff09559f3c2994306";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/tl/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tl/firefox-98.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "eee74ab0114e6d43a92d081048d8b4a560bc6534cc40dc1f6986472cf1f55089";
+ sha256 = "f323e7204e86b91cce656780e65bfb4166bd0e27d1ba84ede5e8b87ab6c4e122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/tr/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tr/firefox-98.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "bd085cf744b30adade22ebf1a3483468154798c457968cf28b2b6466dfd3942b";
+ sha256 = "cf36e947181fc7750186b75edb0998df3219097ed94e4617435cff2690f626d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/trs/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/trs/firefox-98.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "b62b22cae2b433b417d986f0e6dadb1cc9e18756e6dc5add12f3b4ebc579905a";
+ sha256 = "137270152321a9922decfbfcad4643ce9d3b127498d91ef7a4d60069d249632e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/uk/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uk/firefox-98.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "039a1cb867a67776f5895ff5fe30fba423f90349dc3d414ffac38a1e9ada8555";
+ sha256 = "4571eb45952e27756ba8332cd62673c3cd21d58b85662d6eae7a43afc5aa9613";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/ur/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ur/firefox-98.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "4395013e4a95c1c558b7b56c3c5a0ad91e1dd71ebe63a4e3ffe059e55d0c265c";
+ sha256 = "77d60ba1a7bf22d7fb690ec1c22dd35b84b3e59891d07c129335894d3c47e8fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/uz/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uz/firefox-98.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "05597062b24868b0dca7869afd2254f66963e1e36976d995d061cd4451514026";
+ sha256 = "a716e77dae132d1741366836c9fb59320477f623cef47713e93ff7ea6c712d49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/vi/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/vi/firefox-98.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "15aef2b0666f6c2eb9b673e880551c1fe80976fd22c6462e52500bf87afe076c";
+ sha256 = "90d8f9ae57521d77e4f9db4166aa7124f4b935f3f1531639058cecd7cf96be36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/xh/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/xh/firefox-98.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "404d67957ac6ad847ba8983928285789d8d76bc39c4ca2864ea7ce61f4e610fe";
+ sha256 = "ede2ab7f812aeef2f4f07ceac4df1edcdeca35c1b8d1d64053a7250fd781187e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/zh-CN/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-CN/firefox-98.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "1572fa6528616efbadf7475c587b163780d5b8ac2c186179ae9161b3557a5f9c";
+ sha256 = "02c61d1b1bb6e966444a800a319eb69fa36ce913614369d0c8f95388e4bdd14d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.2/linux-i686/zh-TW/firefox-97.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-TW/firefox-98.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "da300411ebae5ada6030d116f989d5d8f1808c31ede8d7eeaf4b851330001f9d";
+ sha256 = "5c347fe33e423b8300fd6f2a0a3026896ac6c74af7bbdfead40f72874e65b0c2";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json
index bcedf9d22d..bf1e1e2f4e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "97.0.1-1",
+ "packageVersion": "97.0.2-1",
"source": {
- "rev": "97.0.1-1",
- "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j"
+ "rev": "97.0.2-1",
+ "sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m"
},
"firefox": {
- "version": "97.0.1",
- "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"
+ "version": "97.0.2",
+ "sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c"
}
}
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 a01c09fe0d..6dd783d866 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -16,7 +16,7 @@ rec {
meta = {
description = "A web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
- maintainers = with lib.maintainers; [ eelco lovesegfault hexa ];
+ maintainers = with lib.maintainers; [ lovesegfault hexa ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
@@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
- version = "91.6.1esr";
+ version = "91.7.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5";
+ sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 52fe1ffe2d..4713320e06 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -105,7 +105,7 @@ let
enterprisePolicies =
{
- policies = lib.optionalAttrs usesNixExtensions {
+ policies = {
DisableAppUpdate = true;
} //
lib.optionalAttrs usesNixExtensions {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
index a37278bcc3..69ee0444c3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
@@ -50,11 +50,11 @@ let
in stdenv.mkDerivation rec {
pname = "opera";
- version = "83.0.4254.54";
+ version = "84.0.4316.21";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
- sha256 = "sha256-kv90FmenGpAbNyw/puwEbR/vVNHV2d5UdX3amMTcI7k=";
+ sha256 = "sha256-CEKUd2QlZQJbpBO1t4oKmyd+uhPiCOY+eXtSrZf75e4=";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index df9bdfb77f..fc66f471e4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -12,6 +12,7 @@
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
, enableWidevine ? false, vivaldi-widevine ? null
, commandLineArgs ? ""
+, pulseSupport ? stdenv.isLinux, libpulseaudio
}:
let
@@ -40,7 +41,8 @@ in stdenv.mkDerivation rec {
freetype fontconfig libXrender libuuid expat glib nss nspr
libxml2 pango cairo
libdrm mesa
- ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
+ ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
+ ++ lib.optional pulseSupport libpulseaudio;
libPath = lib.makeLibraryPath buildInputs
+ lib.optionalString (stdenv.is64bit)
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
index a54ccfdf6c..0ea0c55152 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
@@ -50,11 +50,11 @@
stdenv.mkDerivation rec {
pname = "yandex-browser";
- version = "21.6.2.817-1";
+ version = "22.1.3.856-1";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
- sha256 = "sha256-xeZkQzVPPNABxa3/YBLoZl1obbFdzxdqIgLyoA4PN8U=";
+ sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE=";
};
nativeBuildInputs = [
@@ -109,21 +109,22 @@ stdenv.mkDerivation rec {
];
unpackPhase = ''
- mkdir -p $TMP/ya $out/bin
- cp $src $TMP/ya.deb
- ar vx ya.deb
+ mkdir $TMP/ya/ $out/bin/ -p
+ ar vx $src
tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/
'';
installPhase = ''
- cp -R $TMP/ya/opt $out/
+ cp $TMP/ya/{usr/share,opt} $out/ -R
+ substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/
ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser
'';
- runtimeDependencies = [
- libpulseaudio.out
- (lib.getLib systemd)
- ];
+ runtimeDependencies = map lib.getLib [
+ libpulseaudio
+ curl
+ systemd
+ ] ++ buildInputs;
meta = with lib; {
description = "Yandex Web Browser";
@@ -131,6 +132,5 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
maintainers = with maintainers; [ dan4ik605743 ];
platforms = [ "x86_64-linux" ];
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
index 976ef396ac..07817e3ab0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "3.2.8";
+ version = "3.2.9";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "sha256-A6YI5OGveJj9RRk1fMF3ejYYnMsbjxE34ximtkZUNys=";
+ sha256 = "sha256-lZ6FjWXhVc51BlioDSryeYe5aZeUhMMEde+kk2SwV20=";
};
vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix
index b14c98b445..786615801b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clusterctl";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
- sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk=";
+ sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8=";
};
- vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE=";
+ vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA=";
subPackages = [ "cmd/clusterctl" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
index 73888f41f9..aad583c675 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cni-plugins";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE=";
+ sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix
index 725cd419d0..4c22b9adca 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -1,56 +1,56 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "driftctl";
- version = "0.20.0";
+ version = "0.23.0";
src = fetchFromGitHub {
- owner = "cloudskiff";
+ owner = "snyk";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-8egkz1wXvdNoTkbhOdvoP4hrBPmuiUvd2QaD6tPH2xU=";
+ sha256 = "sha256-TUwTvCsWB+n+shVU1hTzLYROG9Wp4ySzJwAnappK7TY=";
};
- vendorSha256 = "sha256-lftOTcob8l9dUZkH2MMxzD6FZzLOR/PXEXFVdOaguK4=";
+ vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E=";
- postUnpack = ''
- # Without this, tests fail to locate aws/3.19.0.json
- for prefix in / \
- /pkg \
- /pkg/analyser \
- /pkg/alerter \
- /pkg/remote \
- /pkg/middlewares \
- /pkg/cmd/scan/output \
- /pkg/iac/terraform/state \
- /pkg/iac/supplier ; do
- mkdir -p ./source/$prefix/github.com/cloudskiff
- ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl
- done
+ nativeBuildInputs = [ installShellFiles ];
- # Disable check for latest version and telemetry, which are opt-out.
- # Making it out-in is quite a job, and why bother?
- find -name '*.go' \
- | xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g'
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/snyk/driftctl/pkg/version.version=v${version}"
+ "-X github.com/snyk/driftctl/build.env=release"
+ "-X github.com/snyk/driftctl/build.enableUsageReporting=false"
+ ];
- # and remove corresponding flags from --help, so things look tidy.
- find -name driftctl.go | \
- xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d'
+ postInstall = ''
+ installShellCompletion --cmd driftctl \
+ --bash <($out/bin/driftctl completion bash) \
+ --fish <($out/bin/driftctl completion fish) \
+ --zsh <($out/bin/driftctl completion zsh)
+ '';
- # Presumably it can be done with ldflags, but I failed to find incantation
- # that would work, we here we go old-school.
- find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/'
- find -name build.go | xargs sed -i -e 's/"dev"/"release"/'
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
- # Fix the tests that checks for dev-dev.
- find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
- find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/'
+ $out/bin/driftctl --help
+ $out/bin/driftctl version | grep "v${version}"
+ # check there's no telemetry flag
+ $out/bin/driftctl --help | grep -vz "telemetry"
+
+ runHook postInstallCheck
'';
meta = with lib; {
- description = "Tool to track infrastructure drift";
- homepage = "https://github.com/cloudskiff/driftctl";
+ homepage = "https://driftctl.com/";
+ changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}";
+ description = "Detect, track and alert on infrastructure drift";
+ longDescription = ''
+ driftctl is a free and open-source CLI that warns of infrastructure drift
+ and fills in the missing piece in your DevSecOps toolbox.
+ '';
license = licenses.asl20;
- maintainers = with maintainers; [ kaction ];
+ maintainers = with maintainers; [ kaction jk ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
index 9c929ba260..df44c25cdc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
- version = "0.6.14";
+ version = "0.6.15";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
- sha256 = "sha256-4gHwf8zOkCKbOPU4Zq1u4h5vn0r1Vi/B++ERxvr/iuk=";
+ sha256 = "sha256-Gf4YxxyNALicb9GPpOW+Kzb2xrwcAU1XYOzXochH0LI=";
};
vendorSha256 = null;
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 42d2e63eaa..408f1bd3ed 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.8.0";
- gitCommit = "d14138609b01886f544b2025f5000351c9eb092e";
+ version = "3.8.1";
+ gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg=";
+ sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY=";
};
- vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc=";
+ vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
index f492bfd688..d5faebdab3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
- sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo=";
+ sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
index 8c8a6d9293..74b5578d02 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
- version = "22.1.4";
- sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n";
- vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc=";
+ version = "22.2.4";
+ sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369";
+ vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI=";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
index 9a3a5f3a3d..48ac2dc983 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
- version = "0.17.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs=";
+ sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY=";
};
- vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY=";
+ vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
index 8613abd994..374d9c972c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
let
# look for GO_LDFLAGS getting set in the Makefile
- version = "0.14.2";
- sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI=";
- vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk=";
- pkgsVersion = "0.9.0-4-gc875fbe";
- extrasVersion = "0.7.0-2-gb4c9d21";
+ version = "0.14.3";
+ sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU=";
+ vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk=";
+ pkgsVersion = "v0.9.0-6-gbfcc795";
+ extrasVersion = "v0.7.0-2-gb4c9d21";
in
buildGoModule rec {
pname = "talosctl";
@@ -29,8 +29,8 @@ buildGoModule rec {
"-X ${versionPkg}.Name=Talos"
"-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do
"-X ${versionPkg}.Tag=${src.rev}"
- "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS
- "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS
+ "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS
+ "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS
"-X ${imagesPkgs}.Username=talos-systems" # USERNAME
"-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
"-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 9f3c046a26..65a3716878 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA=";
+ sha256 = "sha256-rzKEjLjX2bPqgNGJYdyTuu15+9bq9WnsrJtsBzL/oOo=";
};
vendorSha256 = null;
@@ -52,10 +52,12 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://tekton.dev";
changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
- description = "Provides a CLI for interacting with Tekton";
+ description = "Provides a CLI for interacting with Tekton - tkn";
longDescription = ''
- The Tekton Pipelines cli project provides a CLI for interacting with Tekton!
- For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines.
+ The Tekton Pipelines cli project provides a CLI for interacting with
+ Tekton! For your convenience, it is recommended that you install the
+ Tekton CLI, tkn, together with the core component of Tekton, Tekton
+ Pipelines.
'';
license = licenses.asl20;
maintainers = with maintainers; [ jk mstrangfeld vdemeester ];
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 7f80069997..73c7610139 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
@@ -3,10 +3,10 @@
"owner": "CiscoDevNet",
"provider-source-address": "registry.terraform.io/CiscoDevNet/aci",
"repo": "terraform-provider-aci",
- "rev": "v2.0.0",
- "sha256": "1v62lfm9w8d8iq70nwjrry52zxh5ixmxfp0dlmxvck7qjzcng8rg",
+ "rev": "v2.0.1",
+ "sha256": "165k2sf4hq84zidlh0y5jmzwnid5gz7slhnb9rgp2771pzqm0gki",
"vendorSha256": null,
- "version": "2.0.0"
+ "version": "2.0.1"
},
"acme": {
"owner": "vancluever",
@@ -30,20 +30,20 @@
"owner": "akamai",
"provider-source-address": "registry.terraform.io/akamai/akamai",
"repo": "terraform-provider-akamai",
- "rev": "v1.10.1",
- "sha256": "0gbvq5hlibqxch4igicsyfqfbvm9pdz4901ywaabnd80jmsfhv4c",
- "vendorSha256": "0rzxfybxdsl99mzr5r5amammpsjv66fiakialfws696mz915zz4k",
- "version": "1.10.1"
+ "rev": "v1.11.0",
+ "sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd",
+ "vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb",
+ "version": "1.11.0"
},
"alicloud": {
"deleteVendor": true,
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
- "rev": "v1.158.0",
- "sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr",
+ "rev": "v1.159.0",
+ "sha256": "0vfpmagxrlv6fqaq008lhygxd49br06d0bi1w6dsazfszw3ihj02",
"vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0",
- "version": "1.158.0"
+ "version": "1.159.0"
},
"ansible": {
"owner": "nbering",
@@ -85,19 +85,19 @@
"owner": "AviatrixSystems",
"provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
"repo": "terraform-provider-aviatrix",
- "rev": "v2.21.0-6.6.ga",
- "sha256": "0svims34vw8xplza77flp675r90rsh9gj8cb5c02knnh4lgf7ffv",
+ "rev": "v2.21.1-6.6.ga",
+ "sha256": "16ym9zyvvz7kb44rm97wqa7h431jkh70q3gf68mmxihvxpjvfcdh",
"vendorSha256": null,
- "version": "2.21.0-6.6.ga"
+ "version": "2.21.1-6.6.ga"
},
"aws": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
- "rev": "v4.3.0",
- "sha256": "05rxs09kqpiqhvphcwx7bw22sawsfcmlbhwyi7ss2pdbb9yhpz3s",
- "vendorSha256": "0wh7rywm1y21ah1y52d4kykvf2zqa95qzs59r9skm3af8dsvfjgn",
- "version": "4.3.0"
+ "rev": "v4.4.0",
+ "sha256": "082bllsihmc4jndi1hrv1chcrdm755vphlgpajg22s1ajmylqgm5",
+ "vendorSha256": "0j6ghjr2mhi7nixkk8v9vwm6sr78h0wnj1lxs19lkrpnvy6jc31i",
+ "version": "4.4.0"
},
"azuread": {
"owner": "hashicorp",
@@ -139,10 +139,10 @@
"owner": "F5Networks",
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
"repo": "terraform-provider-bigip",
- "rev": "v1.12.2",
- "sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg",
+ "rev": "v1.13.0",
+ "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv",
"vendorSha256": null,
- "version": "1.12.2"
+ "version": "1.13.0"
},
"bitbucket": {
"owner": "DrFaust92",
@@ -166,10 +166,10 @@
"owner": "checkly",
"provider-source-address": "registry.terraform.io/checkly/checkly",
"repo": "terraform-provider-checkly",
- "rev": "v1.4.1",
- "sha256": "15biy4gm8lwmqm1s5rjr0d77vy4mgyjwaa3wydrna1655w3rgkr6",
+ "rev": "v1.4.2",
+ "sha256": "1wd9834d3yi2y35yrcrgxmzijrb2ymz11gqmva9m1hd10i0aqj9f",
"vendorSha256": "0pjxrdpsn99g6hjp0flrk7czjb05ibnsjcggrvvpwzrbj55rqzgd",
- "version": "1.4.1"
+ "version": "1.4.2"
},
"checkpoint": {
"deleteVendor": true,
@@ -230,10 +230,10 @@
"owner": "Constellix",
"provider-source-address": "registry.terraform.io/Constellix/constellix",
"repo": "terraform-provider-constellix",
- "rev": "v0.4.0",
- "sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw",
+ "rev": "v0.4.1",
+ "sha256": "15myw5ff22wi4cykwc2plghmfwl6d6m9pfskjqiwq8hffv35h50v",
"vendorSha256": null,
- "version": "0.4.0"
+ "version": "0.4.1"
},
"consul": {
"owner": "hashicorp",
@@ -338,10 +338,10 @@
"owner": "exoscale",
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
"repo": "terraform-provider-exoscale",
- "rev": "v0.31.2",
- "sha256": "1fncpy8vc72g6h560mnkwm160wah8iik4bn12mjgbz3nvjlsm04x",
+ "rev": "v0.32.0",
+ "sha256": "1jnpbw50cqzkxr1xgxxnkg0fp65mz84v9fqxpv4j29djgvi94w2m",
"vendorSha256": null,
- "version": "0.31.2"
+ "version": "0.32.0"
},
"external": {
"owner": "hashicorp",
@@ -356,19 +356,19 @@
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
- "rev": "v1.1.0",
- "sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf",
+ "rev": "v1.1.1",
+ "sha256": "1n7lwvfp4y0k1rh13jz94im367h6mxmvglik2nddq58pmxwns2lz",
"vendorSha256": null,
- "version": "1.1.0"
+ "version": "1.1.1"
},
"flexibleengine": {
"owner": "FlexibleEngineCloud",
"provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
"repo": "terraform-provider-flexibleengine",
- "rev": "v1.27.0",
- "sha256": "0xc0a1gzdld039b4vlivf9b8g3pjja6pfzyqhjx0iy01akm1a9cc",
+ "rev": "v1.27.1",
+ "sha256": "0glfs1hq9v3jdga8vvjrybld4g6qmyhy4kayapccbmdnbx9rpg76",
"vendorSha256": null,
- "version": "1.27.0"
+ "version": "1.27.1"
},
"fortios": {
"owner": "fortinetdev",
@@ -392,39 +392,39 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
- "rev": "v4.20.0",
- "sha256": "0cibbzj3nj5dgi2mcr93bdxwvb7r2qscwshjbssbc7avwvhh3171",
+ "rev": "v4.20.1",
+ "sha256": "1kqi41g1lw2phar7gy35rf92qb5s32p7q780d9wrmyimriwhlh4j",
"vendorSha256": null,
- "version": "4.20.0"
+ "version": "4.20.1"
},
"gitlab": {
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
- "rev": "v3.10.0",
- "sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql",
- "vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj",
- "version": "3.10.0"
+ "rev": "v3.11.1",
+ "sha256": "19l2m1d8jn5c8kd39fhw34f805ckad36vs4a2xalpb3whj89sfwy",
+ "vendorSha256": "0flvda6jrq5ff8lk0405bxs90rwpaw3aci85bfd9k258sp3ign9s",
+ "version": "3.11.1"
},
"google": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.11.0",
- "sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm",
- "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
- "version": "4.11.0"
+ "rev": "v4.12.0",
+ "sha256": "0yrzzg7b1dqfsz6wpqh869qwdwbi747hr5xwcjycl8mz4ajlwzsz",
+ "vendorSha256": "1rfhcapahzss8frpnyag53r5s7iqwq7ndqjv30bmhzw3ilwgdfdr",
+ "version": "4.12.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.11.0",
- "sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy",
- "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
- "version": "4.11.0"
+ "rev": "v4.12.0",
+ "sha256": "0dbhzch3vixl8lpdd39p1crx997kdg25scliha7nj2g7a8cli73y",
+ "vendorSha256": "1rfhcapahzss8frpnyag53r5s7iqwq7ndqjv30bmhzw3ilwgdfdr",
+ "version": "4.12.0"
},
"grafana": {
"owner": "grafana",
@@ -484,10 +484,10 @@
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.33.0",
- "sha256": "07m2kzx4m9gn9j5czlfdsq0a1ki8vfwlywrfgz2jxvz2cqnn4gsx",
+ "rev": "v1.34.1",
+ "sha256": "14dxnphzg53qc9jxp5gr4vv0gj9j9i36zdyxh9ffcpcv4y3v9lkj",
"vendorSha256": null,
- "version": "1.33.0"
+ "version": "1.34.1"
},
"huaweicloudstack": {
"owner": "huaweicloud",
@@ -511,10 +511,10 @@
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
- "rev": "v1.39.0-beta0",
- "sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1",
- "vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5",
- "version": "1.39.0-beta0"
+ "rev": "v1.39.1",
+ "sha256": "1f7zhczsz9w4lk2fzcbk1w1pjwnmbgn7lk8nsyk5azkspbf4hjzv",
+ "vendorSha256": "1dhm99h7srnfwscdqy2zaj3wjdb0v1ybb7arv60522xvhsdnb99r",
+ "version": "1.39.1"
},
"icinga2": {
"owner": "Icinga",
@@ -719,10 +719,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
- "rev": "v2.37.0",
- "sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9",
- "vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz",
- "version": "2.37.0"
+ "rev": "v2.39.0",
+ "sha256": "03raj9a0qxvss03ab78pdqwbkc4hc95khzi7lg1a156vxfnibdr2",
+ "vendorSha256": "0sch3wdgy6mx8a983miwi5ihky2j4mzvcg8wilwlp7nsgrfv6ghc",
+ "version": "2.39.0"
},
"nomad": {
"owner": "hashicorp",
@@ -774,19 +774,19 @@
"owner": "terraform-providers",
"provider-source-address": "registry.terraform.io/hashicorp/oci",
"repo": "terraform-provider-oci",
- "rev": "v4.65.0",
- "sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq",
+ "rev": "v4.66.0",
+ "sha256": "0iyh87ckv18f3krlhklj07shv5jwskp6fd70fq3zzfdl07jyy429",
"vendorSha256": null,
- "version": "4.65.0"
+ "version": "4.66.0"
},
"okta": {
"owner": "okta",
"provider-source-address": "registry.terraform.io/okta/okta",
"repo": "terraform-provider-okta",
- "rev": "v3.21.0",
- "sha256": "1j1nvg0qj8xaqnbwlrnhpy73032zc1ik78c0q1iq7xa2gs833qya",
+ "rev": "v3.22.0",
+ "sha256": "1fsxdljpyb9qxc32jgi1yrwrs8rb8iz7ld11a0sm65qhh5yvl5jh",
"vendorSha256": "0l0di6cmm41z7i4d498xxc8wcrbg6r9w4vcdksqhz92s1gqs3f4z",
- "version": "3.21.0"
+ "version": "3.22.0"
},
"oktaasa": {
"owner": "oktadeveloper",
@@ -991,10 +991,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
- "rev": "v6.8.1",
- "sha256": "094a3avlvaacw8g45ll17x1wrch47m5bvj548rvmz77pdbhpzvr5",
- "vendorSha256": "12c1lhyrl3bwnkvp4qw9wxawy54x3k86vh1dnnvf5n8916pvwcw0",
- "version": "6.8.1"
+ "rev": "v6.9.0",
+ "sha256": "08p33mjshi3m36yxhlvlsghnqmw2pnihglxm2p9iapi0zg3wxqbq",
+ "vendorSha256": "0hw7gz08k27kswbn42kab730f8gj2sjksmkc662hb9nbq8ykazbd",
+ "version": "6.9.0"
},
"skytap": {
"owner": "skytap",
@@ -1005,6 +1005,15 @@
"vendorSha256": null,
"version": "0.14.5"
},
+ "snowflake": {
+ "owner": "chanzuckerberg",
+ "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
+ "repo": "terraform-provider-snowflake",
+ "rev": "v0.25.36",
+ "sha256": "sha256-AeIQfdn68EnSj2BXZIsC0+L3EJ6tRHLD0NYHdPcf89w=",
+ "vendorSha256": "sha256-oYjoTZ79ricoFZTokiFcCKNXAeqFvW4RIMQmTp763gE=",
+ "version": "0.25.36"
+ },
"sops": {
"owner": "carlpett",
"provider-source-address": "registry.terraform.io/carlpett/sops",
@@ -1063,10 +1072,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.61.13",
- "sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s",
+ "rev": "v1.63.0",
+ "sha256": "1d5mzmr5r01gqf519r7f3mfcm1w7hryansymwazjbwy2rxpsn958",
"vendorSha256": null,
- "version": "1.61.13"
+ "version": "1.63.0"
},
"tfe": {
"owner": "hashicorp",
@@ -1191,10 +1200,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/vsphere",
"repo": "terraform-provider-vsphere",
- "rev": "v2.0.2",
- "sha256": "0ncl2vs6gcx9wm710hg575hqinkg45ds73n209xwdbpxlbv8qb7m",
+ "rev": "v2.1.0",
+ "sha256": "193qprm7psx0gshv5q7idm05k78rpi2vpdg5pgs7bq1wpzlaqrpa",
"vendorSha256": null,
- "version": "2.0.2"
+ "version": "2.1.0"
},
"vultr": {
"owner": "vultr",
@@ -1218,9 +1227,9 @@
"owner": "yandex-cloud",
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
"repo": "terraform-provider-yandex",
- "rev": "v0.71.0",
- "sha256": "1ccfmn6j96jy6hhqijjas31ylsmhs1gj8367v3b94mgam7p1pxcd",
- "vendorSha256": "16cdg3j00dkmddxgb94as49470a67nv8linfm6s9vrx3xvjk04xw",
- "version": "0.71.0"
+ "rev": "v0.72.0",
+ "sha256": "0sjwyaqb7rgmwpskw95gmb5k0bfj06f9s8kn76rk1hc8rdqrl251",
+ "vendorSha256": "1bh7sc210n3rzq5065qzch8pfq3ppcg6fhy7yha23xaa5j8yabqx",
+ "version": "0.72.0"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
index 47392ea83a..5193d1de5d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.25.1";
+ version = "0.25.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU=";
+ sha256 = "sha256-L5pXq4vfus8gpQMO+j2+WXMPkk3sv3WeeeYrBFd+w7s=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
index 9c9cc56539..f8dcbc0183 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
@@ -11,15 +11,15 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.72";
+ version = "1.2.73";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- sha256 = "sha256-svnZBzFYKj9hIjv4SqPSP65rKIeWQqs2qwnx8J7dUIg=";
+ sha256 = "sha256-E16p40Pmr9o2946XlO3TUE/xUueG0NBWux23MgAVLlI=";
};
- vendorSha256 = "sha256-75uCGxW6Gqfhk5oImz26fUR8BeGHkikXHGJcCH32MxQ=";
+ vendorSha256 = "sha256-NHeUj1JWRqElY2BpQ+7ANqwlOYQ5H2R00LGqktcsoF4=";
proxyVendor = true;
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix
index 57a791d9db..9c0fda32ac 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cozy-drive/default.nix
@@ -5,12 +5,12 @@
let
pname = "cozydrive";
- version = "3.30.1";
+ version = "3.32.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage";
- sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs";
+ sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
index 8b6a5e2cc2..c6ada11d35 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.14.0";
+ version = "3.15.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU=";
+ sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM=";
};
- vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ=";
+ vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
index 9b173e8568..633c1e744b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
@@ -11,6 +11,7 @@
, wrapGAppsHook
, glib
+, glib-networking
, gtk3
, libhandy
, listparser ? callPackage ./listparser.nix { }
@@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
glib
+ glib-networking
gtk3
libhandy
webkitgtk
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index ac0869e5cd..6d3353c251 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
- "version": "1.10.4",
+ "version": "1.10.6",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -61,7 +61,7 @@
"app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
- "electron": "^15.3.5",
+ "electron": "^17",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json
index 27dbb16f08..d1fb0fe1c6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,6 +1,6 @@
{
- "version": "1.10.4",
- "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=",
- "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar",
- "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l"
+ "version": "1.10.6",
+ "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=",
+ "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
+ "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r"
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 99aef1526d..565c44f72e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -25,7 +25,7 @@ flutter.mkFlutterApp rec {
icon = "fluffychat";
desktopName = "Fluffychat";
genericName = "Chat with your friends (matrix client)";
- categories = "Chat;Network;InstantMessaging;";
+ categories = [ "Chat" "Network" "InstantMessaging" ];
};
buildInputs = [
@@ -49,7 +49,7 @@ flutter.mkFlutterApp rec {
# replace olm dummy path
postConfigure = ''
- M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*)
+ M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*)
ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
index b5c558e770..ac17f75908 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
@@ -4,11 +4,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
- version = "3.7.7";
+ version = "3.7.8";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
- sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY=";
+ sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI=";
};
nativeBuildInputs = [
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 6d1bb0af14..228627ec5c 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
@@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.33.0"; # Please backport all updates to the stable channel.
+ version = "5.34.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:
@@ -34,7 +34,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 = "03c7pw6cmv8ryw2wqsfc27d953950jc8nxs58mgk08g62v4qa672";
+ sha256 = "sha256-uU4WJtd9qwrjHgsK0oDg/pCf/5lfNhoMDEd/lHUnLwk=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
index e102b1077a..4d7f5b0ca3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix
@@ -3,9 +3,11 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
-, dbus
-, openssl
, Foundation
+, dbusSupport ? stdenv.isLinux, dbus
+# rustls will be used for TLS if useOpenSSL=false
+, useOpenSSL ? stdenv.isLinux, openssl
+, notificationSupport ? stdenv.isLinux
}:
rustPlatform.buildRustPackage rec {
@@ -22,9 +24,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
- buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation;
+ buildInputs = lib.optionals dbusSupport [ dbus ]
+ ++ lib.optionals useOpenSSL [ openssl ]
+ ++ lib.optional stdenv.isDarwin Foundation;
- buildFeatures = lib.optional stdenv.isLinux "desktop-notifications";
+ buildFeatures = lib.optional notificationSupport "desktop-notifications";
meta = with lib; {
description = "A console IRC client";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
index 4e70facb5f..1c2d411008 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
- version = "0.5.5";
+ version = "0.5.8";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ=";
+ sha256 = "sha256-Ejaspj0YpkGmfO1omOhx8ZDg77J7NqC32mw5Cd3K1FM=";
};
- cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU=";
+ cargoSha256 = "sha256-xce2iHrqTxIirrut4dN7526pjE4T+ruaDS44jr+KeGs=";
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
@@ -34,6 +34,8 @@ rustPlatform.buildRustPackage rec {
openssl
];
+ cargoTestFlags = [ "--lib" ];
+
postInstall = lib.optionalString enableCompletions ''
# Install shell function
installShellCompletion --cmd himalaya \
@@ -46,7 +48,7 @@ rustPlatform.buildRustPackage rec {
description = "CLI email client written in Rust";
homepage = "https://github.com/soywod/himalaya";
changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
- license = licenses.bsd3;
+ license = licenses.bsdOriginal;
maintainers = with maintainers; [ yanganto ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index eb708962e0..492abf1f37 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,655 +1,655 @@
{
- version = "91.6.1";
+ version = "91.7.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda";
+ sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361";
+ sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09";
+ sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645";
+ sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21";
+ sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058";
+ sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2";
+ sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff";
+ sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a";
+ sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c";
+ sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe";
+ sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8";
+ sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39";
+ sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41";
+ sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad";
+ sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e";
+ sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87";
+ sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f";
+ sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8";
+ sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091";
+ sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031";
+ sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7";
+ sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba";
+ sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1";
+ sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40";
+ sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921";
+ sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489";
+ sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220";
+ sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4";
+ sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65";
+ sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48";
+ sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3";
+ sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230";
+ sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6";
+ sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5";
+ sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9";
+ sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9";
+ sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4";
+ sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef";
+ sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac";
+ sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a";
+ sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022";
+ sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3";
+ sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe";
+ sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af";
+ sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db";
+ sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c";
+ sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620";
+ sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262";
+ sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30";
+ sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d";
+ sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005";
+ sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991";
+ sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462";
+ sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39";
+ sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa";
+ sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a";
+ sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8";
+ sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc";
+ sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb";
+ sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae";
+ sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280";
+ sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2";
+ sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe";
+ sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321";
+ sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea";
+ sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf";
+ sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3";
+ sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014";
+ sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff";
+ sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b";
+ sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066";
+ sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d";
+ sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99";
+ sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344";
+ sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b";
+ sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226";
+ sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915";
+ sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9";
+ sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311";
+ sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c";
+ sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0";
+ sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51";
+ sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40";
+ sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2";
+ sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274";
+ sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996";
+ sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab";
+ sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7";
+ sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860";
+ sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e";
+ sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41";
+ sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429";
+ sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8";
+ sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89";
+ sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1";
+ sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee";
+ sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d";
+ sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb";
+ sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983";
+ sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9";
+ sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3";
+ sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e";
+ sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee";
+ sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd";
+ sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420";
+ sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc";
+ sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207";
+ sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0";
+ sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d";
+ sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2";
+ sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c";
+ sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2";
+ sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e";
+ sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91";
+ sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd";
+ sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35";
+ sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec";
+ sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49";
+ sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a";
+ sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20";
+ sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e";
+ sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922";
+ sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364";
+ sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9";
+ sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d";
+ sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf";
+ sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726";
+ sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97";
+ sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934";
+ sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 5b0b66ca34..3ab0c58ecc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -10,12 +10,12 @@ in
rec {
thunderbird = common rec {
pname = "thunderbird";
- version = "91.6.1";
+ version = "91.7.0";
application = "comm/mail";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2";
+ sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0";
};
patches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
index 0626645113..38a1e2ab2a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix
@@ -976,13 +976,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
- "aws-sdk-2.1083.0" = {
+ "aws-sdk-2.1087.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1083.0";
+ version = "2.1087.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
- sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
+ sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
};
};
"aws-sign2-0.7.0" = {
@@ -2956,13 +2956,13 @@ let
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
};
};
- "has-symbols-1.0.2" = {
+ "has-symbols-1.0.3" = {
name = "has-symbols";
packageName = "has-symbols";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
- sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz";
+ sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==";
};
};
"has-tostringtag-1.0.0" = {
@@ -4486,49 +4486,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.106.0" = {
+ "n8n-core-0.107.0" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.106.0";
+ version = "0.107.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
- sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.107.0.tgz";
+ sha512 = "jwlEv67bPCn1Npp5SkZ11MViQgN96B2bUmSdsKPIBkJGkAPdd6BAUNAhF6qlAS53KhkbSqjuZkn71sDwbHv1cg==";
};
};
- "n8n-design-system-0.12.0" = {
+ "n8n-design-system-0.13.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
- sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
+ url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.13.0.tgz";
+ sha512 = "dnweYfFdU9RLdZhmllAlF35dFp0F8Cxw2YAVPMTYOJ2saTs992kvI+09k5iVHDdRxA92BKRXgRRfvY1p0goXcQ==";
};
};
- "n8n-editor-ui-0.132.1" = {
+ "n8n-editor-ui-0.133.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.132.1";
+ version = "0.133.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
- sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.133.0.tgz";
+ sha512 = "lKi2eyx5mn5vfo5sArvsnQ+1khdkX7I1Aqml5VFgzTUhHDLZB2Pvupu+czE55l9QSGs6oqaN9a9NRblWOHc0zQ==";
};
};
- "n8n-nodes-base-0.163.0" = {
+ "n8n-nodes-base-0.164.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.163.0";
+ version = "0.164.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
- sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.164.0.tgz";
+ sha512 = "5GSd0f1rQZfKt9e0S1zwn5K34TSd1lYkd3MEPKDHjvksxfNOumtZpf0rwEgb/7Uf6azw7ESqk4VXwxiVQu0sgw==";
};
};
- "n8n-workflow-0.88.0" = {
+ "n8n-workflow-0.89.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.88.0";
+ version = "0.89.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
- sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.89.0.tgz";
+ sha512 = "hggmmjHsa3VjP5puRssH4Q8hoigqJ3W+KQeY54Qsa1rJoJEjZYy53NGOQ3QMmuPuTUvVMHe4Z/Hb6u4Bbh1wAg==";
};
};
"named-placeholders-1.1.2" = {
@@ -6340,13 +6340,13 @@ let
sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==";
};
};
- "sqlstring-2.3.2" = {
+ "sqlstring-2.3.3" = {
name = "sqlstring";
packageName = "sqlstring";
- version = "2.3.2";
+ version = "2.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz";
- sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==";
+ url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz";
+ sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==";
};
};
"sse-channel-3.1.1" = {
@@ -6367,13 +6367,13 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
- "ssh2-1.6.0" = {
+ "ssh2-1.7.0" = {
name = "ssh2";
packageName = "ssh2";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz";
- sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
+ url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz";
+ sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g==";
};
};
"ssh2-sftp-client-7.2.2" = {
@@ -7375,13 +7375,13 @@ let
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
};
};
- "xss-1.0.10" = {
+ "xss-1.0.11" = {
name = "xss";
packageName = "xss";
- version = "1.0.10";
+ version = "1.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
- sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
+ url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
+ sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
};
};
"xtend-4.0.2" = {
@@ -7480,10 +7480,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.165.1";
+ version = "0.166.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
- sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.166.0.tgz";
+ sha512 = "t8tRpOyrEIxaIuLzfBajDPjAMygcCapiIqHDjU8YloJalI0MnbuoQ6DgA2RdRDZElN0yew0rQR8ZxZ2nMUk8Fg==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@@ -7664,7 +7664,7 @@ in
];
})
sources."avsc-5.7.3"
- (sources."aws-sdk-2.1083.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -8011,7 +8011,7 @@ in
})
sources."has-bigints-1.0.1"
sources."has-flag-4.0.0"
- sources."has-symbols-1.0.2"
+ sources."has-symbols-1.0.3"
sources."has-tostringtag-1.0.0"
sources."has-unicode-2.0.1"
sources."he-1.2.0"
@@ -8224,19 +8224,19 @@ in
];
})
sources."mz-2.7.0"
- (sources."n8n-core-0.106.0" // {
+ (sources."n8n-core-0.107.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
- sources."n8n-design-system-0.12.0"
- sources."n8n-editor-ui-0.132.1"
- (sources."n8n-nodes-base-0.163.0" // {
+ sources."n8n-design-system-0.13.0"
+ sources."n8n-editor-ui-0.133.0"
+ (sources."n8n-nodes-base-0.164.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
- sources."n8n-workflow-0.88.0"
+ sources."n8n-workflow-0.89.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -8534,10 +8534,10 @@ in
})
sources."sprintf-js-1.1.2"
sources."sqlite3-5.0.2"
- sources."sqlstring-2.3.2"
+ sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
- sources."ssh2-1.6.0"
+ sources."ssh2-1.7.0"
sources."ssh2-sftp-client-7.2.2"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
@@ -8695,7 +8695,7 @@ in
sources."xmlbuilder-11.0.1"
sources."xpath.js-1.1.0"
sources."xregexp-2.0.0"
- (sources."xss-1.0.10" // {
+ (sources."xss-1.0.11" // {
dependencies = [
sources."commander-2.20.3"
];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
index 19e8d1eeba..852fcf6898 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix
@@ -52,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0=";
+ sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch
new file mode 100644
index 0000000000..ecf2f4af5b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch
@@ -0,0 +1,50 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index c3e139e..b77d8bd 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1761,11 +1761,11 @@ dependencies = [
+
+ [[package]]
+ name = "magnum-opus"
+-version = "0.3.4-2"
+-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f"
++version = "0.4.0"
++source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604"
+ dependencies = [
+- "bindgen 0.59.1",
+- "target_build_utils",
++ "libc",
++ "opusic-sys",
+ ]
+
+ [[package]]
+@@ -2188,6 +2188,16 @@ version = "0.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+
++[[package]]
++name = "opusic-sys"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5"
++dependencies = [
++ "cmake",
++ "libc",
++]
++
+ [[package]]
+ name = "parity-tokio-ipc"
+ version = "0.7.2"
+diff --git a/Cargo.toml b/Cargo.toml
+index 75504a0..43e1624 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -32,7 +32,7 @@ libc = "0.2"
+ parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
+ flexi_logger = "0.17"
+ runas = "0.2"
+-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" }
++magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" }
+ dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
+ rubato = { version = "0.8", optional = true }
+ samplerate = { version = "0.2", optional = true }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix
new file mode 100644
index 0000000000..677629dbcf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix
@@ -0,0 +1,104 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeDesktopItem
+, copyDesktopItems
+, makeWrapper
+, rustPlatform
+, cmake
+, yasm
+, nasm
+, zip
+, pkg-config
+, clang
+, gtk3
+, xdotool
+, libxcb
+, libXfixes
+, alsa-lib
+, pulseaudio
+, libXtst
+, libvpx
+, libyuv
+, libopus
+, libsciter
+, llvmPackages
+, wrapGAppsHook
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rustdesk";
+ version = "1.1.8";
+
+ src = fetchFromGitHub {
+ owner = "rustdesk";
+ repo = "rustdesk";
+ rev = "0325500ebf331b66220cec6e9078afb83b0e98a7";
+ sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg=";
+ };
+
+ cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw=";
+
+ LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
+
+ # Change magnus-opus version to upstream so that it does not use
+ # vcpkg for libopus since it does not work.
+ cargoPatches = [
+ ./cargo.patch
+ ];
+
+ # Manually simulate a vcpkg installation so that it can link the libaries
+ # properly.
+ postUnpack = let
+ vcpkg_target = "x64-linux";
+ in ''
+ export VCPKG_ROOT="$TMP/vcpkg";
+
+ mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
+
+ ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
+ '';
+
+ nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ];
+ buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ];
+
+ # Checks require an active X display.
+ doCheck = false;
+
+ desktopItems = [ (makeDesktopItem {
+ name = "rustdesk";
+ exec = meta.mainProgram;
+ icon = "rustdesk";
+ desktopName = "RustDesk";
+ comment = meta.description;
+ genericName = "Remote Desktop";
+ categories = ["Network"];
+ }) ];
+
+ # Add static ui resources and libsciter to same folder as binary so that it
+ # can find them.
+ postInstall = ''
+ mkdir -p $out/{share/src,lib/rustdesk}
+
+ # so needs to be next to the executable
+ mv $out/bin/rustdesk $out/lib/rustdesk
+ ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk
+
+ makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \
+ --run "cd $out/share"
+
+ cp -a $src/src/ui $out/share/src
+
+ install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg
+ '';
+
+ meta = with lib; {
+ description = "Yet another remote desktop software";
+ homepage = "https://rustdesk.com";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ leixb ];
+ platforms = [ "x86_64-linux" ];
+ mainProgram = "rustdesk";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
index dfed1f5907..bf9f59444a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,7 +1,21 @@
-{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
-, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
+{ lib
+, fetchurl
+, cups
+, libssh
+, libXpm
+, nx-libs
+, openldap
+, openssh
+, qt5
+, qtbase
+, qtsvg
+, qtx11extras
+, qttools
+, phonon
+, pkg-config
+}:
-mkDerivation rec {
+qt5.mkDerivation rec {
pname = "x2goclient";
version = "4.1.2.2";
@@ -10,8 +24,24 @@ mkDerivation rec {
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
};
- buildInputs = [ cups libssh libXpm nx-libs openldap openssh
- qtbase qtsvg qtx11extras qttools phonon pkg-config ];
+ buildInputs = [
+ cups
+ libssh
+ libXpm
+ nx-libs
+ openldap
+ openssh
+ qtbase
+ qtsvg
+ qtx11extras
+ qttools
+ phonon
+ ];
+
+ nativeBuildInputs = [
+ pkg-config
+ qt5.wrapQtAppsHook
+ ];
postPatch = ''
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
@@ -26,7 +56,7 @@ mkDerivation rec {
installTargets = [ "install_client" "install_man" ];
- qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
+ qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ];
meta = with lib; {
description = "Graphical NoMachine NX3 remote desktop client";
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index c5b5fc56f7..aac85b9d40 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome, glib, ncurses, libepoxy, gpgme
-, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
+, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null
diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
index 121c1ccf36..1d7a02daa9 100644
--- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
- version = "22.2.9";
+ version = "22.3.1";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256
- sha256 = "ced99f4b2106148c683267c2c5ccc5902dc6b98249eb7c132dde2bd6ea37bc34";
+ sha256 = "4d75684751a10f24d20d993b30748c7a09bd8bdfd4e1d4d5703746954a0f6bb2";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
index 5860279d56..3f837edb4c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.32.28";
+ version = "14.32.30";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0=";
+ sha256 = "sha256-VpOoduUA0iD+nI83GSQYQDHoK2Snog0NHkHWHfpLqFM=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
index 3c2b11c0e2..698095715c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "22.3.0";
+ version = "22.7.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg=";
+ sha256 = "sha256-xK4C+0/Qpc2vXPmsI8KuHuDJLmJ5LXdAfRIREE+gkWA=";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
index f8037c01e0..872438158d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
# Hardcode path to fix use with cmake
sed -i cmake/scripts/ROOTConfig.cmake.in \
- -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
+ -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
patchShebangs build/unix/
'' + lib.optionalString noSplash ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix
index 3dbb1a4bf5..3f0a6a6cde 100644
--- a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix
@@ -12,11 +12,11 @@ let
};
in stdenv.mkDerivation rec {
inherit pname;
- version = "1.3.74";
+ version = "1.3.76";
src = fetchurl {
url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip";
- sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x";
+ sha256 = "sha256-vdunUGwLjDKf1LDhtyTQAExddecyWc1TdZOyuu0qMlk=";
};
nativeBuildInputs = [ makeWrapper mono unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
index cca7e7eb9b..1e6db04dd7 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -1,36 +1,40 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring,
- harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel,
- libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
- libxkbcommon, libXi, libXext, wayland-protocols, wayland,
- lcms2,
- librsync,
- installShellFiles,
- dbus,
- darwin,
- Cocoa,
- CoreGraphics,
- Foundation,
- IOKit,
- Kernel,
- OpenGL,
- libcanberra,
- libicns,
- libpng,
- python3,
- zlib,
+{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
+, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel
+, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
+, libxkbcommon, libXi, libXext, wayland-protocols, wayland
+, lcms2
+, librsync
+, installShellFiles
+, dbus
+, darwin
+, Cocoa
+, CoreGraphics
+, Foundation
+, IOKit
+, Kernel
+, OpenGL
+, libcanberra
+, libicns
+, libpng
+, python3
+, zlib
+, bashInteractive
+, zsh
+, fish
+, fetchpatch
}:
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.24.2";
+ version = "0.24.4";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "sha256-nGBdoOueX8tcxXRDqKQ/Q+woT6rNQeLXwy1MJbwizKs=";
+ sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug=";
};
buildInputs = [
@@ -74,6 +78,19 @@ buildPythonApplication rec {
outputs = [ "out" "terminfo" "shell_integration" ];
+ patches = [
+ (fetchpatch {
+ name = "fix-zsh-completion-test-1.patch";
+ url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch";
+ sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE=";
+ })
+ (fetchpatch {
+ name = "fix-zsh-completion-test-2.patch";
+ url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch";
+ sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0=";
+ })
+ ];
+
# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
@@ -101,7 +118,14 @@ buildPythonApplication rec {
runHook postBuild
'';
- checkInputs = [ pillow ];
+ checkInputs = [
+ pillow
+
+ # Shells needed for shell integration tests
+ bashInteractive
+ zsh
+ fish
+ ];
checkPhase =
let buildBinPath =
@@ -132,9 +156,9 @@ buildPythonApplication rec {
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
installShellCompletion --cmd kitty \
- --bash <("$out/bin/kitty" + complete setup bash) \
- --fish <("$out/bin/kitty" + complete setup fish) \
- --zsh <("$out/bin/kitty" + complete setup zsh)
+ --bash <("$out/bin/kitty" +complete setup bash) \
+ --fish <("$out/bin/kitty" +complete setup fish2) \
+ --zsh <("$out/bin/kitty" +complete setup zsh)
terminfo_src=${if stdenv.isDarwin then
''"$out/Applications/kitty.app/Contents/Resources/terminfo"''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
index a0dc4a205d..c1f2c281c7 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "sha256-RlEPC9yyPYj974UVto7w+r24Lc5+Et1Ks49o+QTdrZQ=";
+ sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM=";
};
- cargoSha256 = "sha256-4tOeYiRBF4qDUiI6yU093y0Ttq7+CdmGaA5eqdMjgow=";
+ cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix
index 7bb0dec9eb..032c461a74 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gg/default.nix
@@ -10,8 +10,8 @@
}:
let
- version = "1.2.1";
- commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57";
+ version = "1.3.0";
+ commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f";
in buildGoModule {
pname = "gg-scm";
inherit version;
@@ -20,7 +20,7 @@ in buildGoModule {
owner = "gg-scm";
repo = "gg";
rev = "v${version}";
- sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95";
+ sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f";
};
postPatch = ''
substituteInPlace cmd/gg/editor_unix.go \
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
index 87bd4d891c..543e3a7501 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ghorg";
- version = "1.7.8";
+ version = "1.7.11";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = "v${version}";
- sha256 = "sha256-NZlPcr13onxgbmKPdv0ODOhYDT5T+OeSvHE8VGOGyo4=";
+ sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc=";
};
doCheck = false;
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 3fd3a37419..829ebedc1e 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
@@ -3,7 +3,6 @@
, fetchFromGitHub
, installShellFiles
, git
-, stestr
, nix-update-script
, testVersion
, git-machete
@@ -22,19 +21,15 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ];
- checkInputs = [ git stestr ];
-
- postCheck = ''
- stestr run
- '';
+ checkInputs = [ git ];
postInstall = ''
installShellCompletion --bash --name git-machete completion/git-machete.completion.bash
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
+ installShellCompletion --fish completion/git-machete.fish
'';
postInstallCheck = ''
- git init
test "$($out/bin/git-machete version)" = "git-machete version ${version}"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 4490f8068e..b76f7515eb 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -4,13 +4,13 @@
python3Packages.buildPythonApplication rec {
pname = "git-remote-hg";
- version = "1.0.2.1";
+ version = "1.0.3.2";
src = fetchFromGitHub {
owner = "mnauw";
repo = "git-remote-hg";
rev = "v${version}";
- sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn";
+ sha256 = "0b5lfbrcrvzpz380817md00lbgy5yl4y76vs3vm0bpm5wmr7c027";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix
index ec4db1631b..a4e0290d31 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix
@@ -2,8 +2,8 @@
}:
let
- version = "1.2.2";
- sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk=";
+ version = "1.3.0";
+ sha256 = "sha256-CFv9gZQHeEiZctJFyB6PJ1dVNkrQ7PlVtgZuteQQTJ0=";
in stdenv.mkDerivation {
pname = "git-vendor";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix
index 3c11040291..f8034ce42d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
- version = "1.5.14";
+ version = "1.5.15";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Q1zPPT0gNI96n8PIk1qATRzxm5vmGmRMwZ9j7bb8knk=";
+ sha256 = "sha256-4oI0opwbmEyHc3zx06l8bDPnOi7rGrMqUJPBDAfmPY0=";
};
- cargoSha256 = "sha256-JKM98cpZz2MTa+f2A7NRcKwGjbm4YRabMlV6DHXT64U=";
+ cargoSha256 = "sha256-rmECD/0ThDXBAGqDMNbyHi9eoGNOJhBndaxCuUS/qpc=";
# tests require it to be in a git repository
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
index a431a50af3..63f7a459a7 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "pass-git-helper";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "languitar";
repo = "pass-git-helper";
rev = "v${version}";
- sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI=";
+ sha256 = "sha256-An9JKnS/Uor7iZ+lbBGR3eOkxOgV+SjnCWN/QmqFI/I=";
};
propagatedBuildInputs = [ pyxdg ];
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
index 319fddcc06..83991407fd 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "github-desktop";
- version = "2.9.6";
+ version = "2.9.9";
src = fetchurl {
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
- sha256 = "sha256-YL3Gc76jWfQvY96pAlS5JB7BwSOUklNvGR0tOBdQHuE=";
+ sha256 = "sha256-LMKOxQR3Bgw00LnKqAe2hq+eASgwC7y0cxNSSt/sjWA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 55a2f1627b..2cdc293653 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
@@ -3,7 +3,7 @@
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
-, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems
+, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon
}:
with lib;
@@ -11,22 +11,25 @@ with lib;
let
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
pname = "gitkraken";
- version = "8.2.1";
+ version = "8.3.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "sha256-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA=";
+ sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
- sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs=";
+ sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4=";
};
- aarch64-darwin = srcs.x86_64-darwin;
+ aarch64-darwin = fetchzip {
+ url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
+ sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ=";
+ };
};
src = srcs.${stdenv.hostPlatform.system} or throwSystem;
@@ -85,6 +88,8 @@ let
krb5
libdrm
mesa
+ libxshmfence
+ libxkbcommon
];
desktopItems = [ (makeDesktopItem {
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix
new file mode 100644
index 0000000000..3737828ef7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, qmake
+, qtwebengine
+, gitUpdater
+}:
+
+mkDerivation rec {
+ pname = "gitqlient";
+ version = "1.4.3";
+
+ src = fetchFromGitHub {
+ owner = "francescmm";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "018jz6b28zwr205jmgw13ddlfvlhxqf0cw1pfjiwsi6i8gay7w6s";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ ];
+
+ buildInputs = [
+ qtwebengine
+ ];
+
+ qmakeFlags = [
+ "GitQlient.pro"
+ ];
+
+ passthru.updateScript = gitUpdater { inherit pname version; };
+
+ meta = with lib; {
+ homepage = "https://github.com/francescmm/GitQlient";
+ description = "Multi-platform Git client written with Qt";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix
index add2e525dc..a2f802c6e8 100644
--- a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix
@@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "ffmpeg-normalize";
- version = "1.22.7";
+ version = "1.22.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU=";
+ sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8=";
};
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
index 758e509b85..9c7041441f 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
- version = "19.0.2";
+ version = "19.1.0";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
- sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho=";
+ sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix
index 89eeed8904..18319468ea 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix
@@ -38,24 +38,24 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
assert gbmSupport || waylandSupport || x11Support;
let
- kodiReleaseDate = "20211024";
- kodiVersion = "19.3";
+ kodiReleaseDate = "20220303";
+ kodiVersion = "19.4";
rel = "Matrix";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw";
+ sha256 = "sha256-XDtmY3KthiD91kvueQRSamBcdM7fBpRntmZX6KRsCzE=";
};
ffmpeg = stdenv.mkDerivation rec {
pname = "kodi-ffmpeg";
- version = "4.3.2";
+ version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION
src = fetchFromGitHub {
owner = "xbmc";
repo = "FFmpeg";
- rev = "${version}-${rel}-${kodiVersion}";
+ rev = "${version}-${rel}-19.2";
sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix
index d1f60c3dd2..e6be6f54e1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix
@@ -1,4 +1,4 @@
-{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }:
+{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }:
let
pname = "losslesscut";
@@ -11,7 +11,7 @@ let
src = fetchurl {
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
name = nameSource;
- sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv";
+ inherit sha256;
};
extracted = appimageTools.extractType2 {
inherit name src;
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
index 01f9c15806..be7786f910 100644
--- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
@@ -1,9 +1,9 @@
{ callPackage, stdenvNoCC, lib }:
let
- version = "3.33.1";
- appimage = callPackage ./appimage.nix { inherit version; };
- dmg = callPackage ./dmg.nix { inherit version; };
- windows = callPackage ./windows.nix { inherit version; };
+ version = "3.43.0";
+ appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; };
+ dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; };
+ windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; };
in (
if stdenvNoCC.isDarwin then dmg
else if stdenvNoCC.isCygwin then windows
@@ -13,7 +13,7 @@ in (
meta = with lib; {
description = "The swiss army knife of lossless video/audio editing";
homepage = "https://mifi.no/losslesscut/";
- license = licenses.mit;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ ShamrockLee ];
} // oldAttrs.meta // {
platforms =
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix
index 3d0bad1975..3cbd77198b 100644
--- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchurl, undmg, version }:
+{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }:
let
pname = "losslesscut";
@@ -10,7 +10,7 @@ let
src = fetchurl {
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
name = nameSource;
- sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj";
+ inherit sha256;
};
in stdenvNoCC.mkDerivation {
inherit pname version src;
diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix
index fe5df9d6c9..0e6ed9b041 100644
--- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix
@@ -3,6 +3,7 @@
, fetchurl
, unzip
, version
+, sha256
, useMklink ? false
, customSymlinkCommand ? null
}:
@@ -18,12 +19,12 @@ let
else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}")
else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}");
in stdenvNoCC.mkDerivation {
- inherit pname version;
+ inherit pname version sha256;
src = fetchurl {
name = nameSource;
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
- sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb";
+ inherit sha256;
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 911373c58e..395da881ea 100644
--- a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -27,7 +27,7 @@
}:
let
basename = "streamlink-twitch-gui";
- runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
+ runtimeLibs = lib.makeLibraryPath [ gtk3-x11 libudev0-shim ];
runtimeBins = lib.makeBinPath [ streamlink ];
arch =
if stdenv.hostPlatform.system == "x86_64-linux"
@@ -39,16 +39,16 @@ let
in
stdenv.mkDerivation rec {
pname = "${basename}-bin";
- version = "1.11.0";
+ version = "2.0.0";
src = fetchurl {
url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz";
- sha256 =
+ hash =
if arch == "linux64"
then
- "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y"
+ "sha256-5AgQ+nvv/J493Zi+F+6QRT/DGg8JyusXsP5qVuXtiG4="
else
- "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y";
+ "sha256-+jgTpIYb4BPM7Ixmo+YUeOX5OlQlMaRVEXf3WzS2lAI=";
};
nativeBuildInputs = with xorg; [
diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix
index 957911e239..415790b4c1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix
@@ -6,11 +6,11 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
- version = "3.1.1";
+ version = "3.2.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ=";
+ sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY=";
};
checkInputs = with python3Packages; [
@@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec {
'';
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
license = licenses.bsd2;
- platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
index a5e65480b2..c19b8fa15c 100644
--- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
@@ -82,11 +82,11 @@ let
in
stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc";
- version = "3.0.16";
+ version = "3.0.17";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";
- sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY=";
+ sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of
@@ -187,11 +187,6 @@ stdenv.mkDerivation rec {
BUILDCC = "${stdenv.cc}/bin/gcc";
patches = [
- # Required in order to run newer srt plugin. Remove it when next release arrives
- (fetchpatch {
- url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch";
- sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ=";
- })
# patches to build with recent live555
# upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473
(fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 955d609d7a..bb94c2986f 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -2,19 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
- version = "21.0";
+ version = "22.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- sha256 = "00b0ij9sfv7zsrgwrcj2rzpy1z8bp0m0lmzjp433xzpcgcnzw3w5";
+ sha256 = "1n4i7rgx8rkif2naw429fnkhv0888sfxmnky67fd42mlv1lhz9w8";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
- cargoSha256 = "0lf7bb468s2ic9vabx954i46605gf7c6064vvwqvz7djk30z0y0d";
+ cargoSha256 = "0kc6lcwlqg9l19l4psakgkc5jf28nw1riz85adci897yha1dsnh0";
+
+ OPENSSL_NO_VENDOR = true;
# Integration tests require root.
cargoTestFlags = [ "--bins" ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix
index e83fc4ef50..980955fcda 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/colima/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "colima";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI=";
+ sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
index 35856eae01..2f0ff8cc5f 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.2.3";
+ version = "2.3.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q=";
+ sha256 = "sha256-DbZzVyTafBVsXvm1/aSdXJruKxBq5Ff8AIfDREFFVh0=";
};
- vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww=";
+ vendorSha256 = "sha256-ePL1L/A+48JEu6jpbzy8UBWrFY10iqITILSclfYs8Lw=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
index 03e47a5786..7376e6f66a 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch
@@ -1,44 +1,49 @@
-commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611
-Author: aszlig
-Date: Mon Mar 18 13:21:01 2019 +0100
+From 9e4932ae99946b1a08ab5b5345fd2bc3486e54a5 Mon Sep 17 00:00:00 2001
+From: aszlig
+Date: Mon, 18 Mar 2019 13:21:01 +0100
+Subject: [PATCH] 9pfs: Ignore O_NOATIME open flag
- 9pfs: Ignore O_NOATIME open flag
-
- Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir,
- which in turn causes errors when the Nix store is mounted in the guest
- because the file owner of the store paths typically don't match the
- owner of the QEMU process.
-
- After submitting a patch to the overlayfs mailing list[1], it turns out
- that my patch was incomplete[2] and needs a bit more rework.
-
- So instead of using an incomplete kernel patch in nixpkgs, which affects
- *all* users of overlayfs, not just NixOS VM tests, I decided that for
- now it's better to patch QEMU instead.
-
- The change here really only ignores the O_NOATIME flag so that the
- behaviour is similar to what NFS does. From open(2):
-
- This flag may not be effective on all filesystems. One example is NFS,
- where the server maintains the access time.
-
- This change is therefore only temporary until the final fix lands in the
- stable kernel releases.
-
- [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html
- [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html
-
- Signed-off-by: aszlig
+Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir,
+which in turn causes errors when the Nix store is mounted in the guest
+because the file owner of the store paths typically don't match the
+owner of the QEMU process.
+
+After submitting a patch to the overlayfs mailing list[1], it turns out
+that my patch was incomplete[2] and needs a bit more rework.
+
+So instead of using an incomplete kernel patch in nixpkgs, which affects
+*all* users of overlayfs, not just NixOS VM tests, I decided that for
+now it's better to patch QEMU instead.
+
+The change here really only ignores the O_NOATIME flag so that the
+behaviour is similar to what NFS does. From open(2):
+
+This flag may not be effective on all filesystems. One example is NFS,
+where the server maintains the access time.
+
+This change is therefore only temporary until the final fix lands in the
+stable kernel releases.
+
+[1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html
+[2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html
+
+Signed-off-by: aszlig
+---
+ hw/9pfs/9p.c | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
-index 55821343e5..0b8425fe18 100644
+index a6d6b3f835..4eb26e2294 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
-@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags)
- { P9_DOTL_LARGEFILE, O_LARGEFILE },
- { P9_DOTL_DIRECTORY, O_DIRECTORY },
- { P9_DOTL_NOFOLLOW, O_NOFOLLOW },
+@@ -139,7 +139,6 @@ static int dotl_to_open_flags(int flags)
+ { P9_DOTL_DSYNC, O_DSYNC },
+ { P9_DOTL_FASYNC, FASYNC },
+ #ifndef CONFIG_DARWIN
- { P9_DOTL_NOATIME, O_NOATIME },
- { P9_DOTL_SYNC, O_SYNC },
- };
-
+ /*
+ * On Darwin, we could map to F_NOCACHE, which is
+ * similar, but doesn't quite have the same
+--
+2.35.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch
new file mode 100644
index 0000000000..a498d309c2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch
@@ -0,0 +1,77 @@
+From 4ca09b7cd1d42eb6b1587fed74cd4d684e31bfbe Mon Sep 17 00:00:00 2001
+From: Keno Fischer
+Date: Sun, 27 Feb 2022 17:35:22 -0500
+Subject: [PATCH] 9p: darwin: meson: Allow VirtFS on Darwin
+
+To allow VirtFS on darwin, we need to check that pthread_fchdir_np is
+available, which has only been available since macOS 10.12.
+
+Additionally, virtfs_proxy_helper is disabled on Darwin. This patch
+series does not currently provide an implementation of the proxy-helper,
+but this functionality could be implemented later on.
+
+Signed-off-by: Keno Fischer
+[Michael Roitzsch: - Rebase for NixOS]
+Signed-off-by: Michael Roitzsch
+[Will Cohen: - Rebase to master]
+Signed-off-by: Will Cohen
+Reviewed-by: Paolo Bonzini
+[Will Cohen: - Add check for pthread_fchdir_np to virtfs
+ - Add comments to patch commit
+ - Note that virtfs_proxy_helper does not work
+ on macOS
+ - Fully adjust meson virtfs error note to specify
+ macOS
+ - Rebase to master]
+Signed-off-by: Will Cohen
+Message-Id: <20220227223522.91937-12-wwcohen@gmail.com>
+Signed-off-by: Christian Schoenebeck
+Acked-by: Christian Schoenebeck
+---
+ fsdev/meson.build | 1 +
+ meson.build | 17 +++++++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/fsdev/meson.build b/fsdev/meson.build
+index adf57cc43e..b632b66348 100644
+--- a/fsdev/meson.build
++++ b/fsdev/meson.build
+@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
+ 'qemu-fsdev.c',
+ ), if_false: files('qemu-fsdev-dummy.c'))
+ softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
++softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
+
+ if have_virtfs_proxy_helper
+ executable('virtfs-proxy-helper',
+diff --git a/meson.build b/meson.build
+index 2265fa409a..6d73c02903 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1383,12 +1383,17 @@ endif
+ have_host_block_device = (targetos != 'darwin' or
+ cc.has_header('IOKit/storage/IOMedia.h'))
+
+-have_virtfs = (targetos == 'linux' and
+- have_system and
+- libattr.found() and
+- libcap_ng.found())
+-
+-have_virtfs_proxy_helper = have_virtfs and have_tools
++have_virtfs = get_option('virtfs') \
++ .require(targetos == 'linux' or targetos == 'darwin',
++ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \
++ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'),
++ error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \
++ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()),
++ error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \
++ .disable_auto_if(not have_tools and not have_system) \
++ .allowed()
++
++have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
+
+ if get_option('virtfs').enabled()
+ if not have_virtfs
+--
+2.35.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index 2c2094763c..9dcf80d036 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
@@ -88,14 +88,64 @@ stdenv.mkDerivation rec {
patches = [
./fix-qemu-ga.patch
- ./9p-ignore-noatime.patch
# Cocoa clipboard support only works on macOS 10.14+
(fetchpatch {
url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff";
sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2";
revert = true;
})
- ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
+ # 9p-darwin for 7.0 backported to 6.2.0
+ #
+ # Can generally be removed when updating derivation to 7.0. Nine of the
+ # patches can be drawn directly from QEMU upstream, but the second commit
+ # and the eleventh commit had to be modified when rebasing back to 6.2.0.
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/e0bd743bb2dd4985791d4de880446bdbb4e04fed.patch";
+ sha256 = "sha256-c6QYL3zig47fJwm6rqkqGp3E1PakVTaihvXDRebbBlQ=";
+ })
+ ./rename-9p-util.patch
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/f41db099c71151291c269bf48ad006de9cbd9ca6.patch";
+ sha256 = "sha256-70/rrhZw+02JJbJ3CoW8B1GbdM4Lwb2WkUdwstYAoIQ=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/6b3b279bd670c6a2fa23c9049820c814f0e2c846.patch";
+ sha256 = "sha256-7WqklSvLirEuxTXTIMQDQhWpXnwMseJ1RumT+faq/Y8=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/67a71e3b71a2834d028031a92e76eb9444e423c6.patch";
+ sha256 = "sha256-COFm/SwfJSoSl9YDpL6ceAE8CcE4mGhsGxw1HMuL++o=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/38d7fd68b0c8775b5253ab84367419621aa032e6.patch";
+ sha256 = "sha256-iwGIzq9FWW6zpbDg/IKrp5OZpK9cgQqTRWWq8WBIHRQ=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/57b3910bc3513ab515296692daafd1c546f3c115.patch";
+ sha256 = "sha256-ybl9+umZAcQKHYL7NkGJQC0W7bccTagA9KQiFaR2LYA=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/b5989326f558faedd2511f29459112cced2ca8f5.patch";
+ sha256 = "sha256-s+O9eCgj2Ev+INjL9LY9MJBdISIdZLslI3lue2DICGM=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/029ed1bd9defa33a80bb40cdcd003699299af8db.patch";
+ sha256 = "sha256-mGqcRWcEibDJdhTRrN7ZWrMuCfUWW8vWiFj7sb2/RYo=";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch";
+ sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo=";
+ })
+ ./allow-virtfs-on-darwin.patch
+ # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin
+ # support on nix requires utimensat fallback. The patch adding this fallback
+ # set was removed during the process of upstreaming this functionality, and
+ # will still be needed in nix until the macOS SDK reaches 10.13+.
+ ./provide-fallback-for-utimensat.patch
+ # Still needed indefinitely
+ ./9p-ignore-noatime.patch
+ ]
+ ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
postPatch = ''
# Otherwise tries to ensure /var/run exists.
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch
new file mode 100644
index 0000000000..dbc4e2b9af
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch
@@ -0,0 +1,190 @@
+From 70328c307001f4bb75d30d93c5bba3c3cd790c88 Mon Sep 17 00:00:00 2001
+From: Keno Fischer
+Date: Sat, 16 Jun 2018 20:56:54 -0400
+Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat
+
+This function is new in Mac OS 10.13. Provide a fallback implementation
+when building against older SDKs. The complication in the definition comes
+having to separately handle the used SDK version and the target OS version.
+
+- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not
+ defined in the header, so we must not try to use it (doing so would error).
+- Otherwise, if the targetted OS version is at least 10.13, we know this
+ function is available, so we can unconditionally call it.
+- Lastly, we check for the availability of the __builtin_available macro to
+ potentially insert a dynamic check for this OS version. However, __builtin_available
+ is only available with sufficiently recent versions of clang and while all
+ Apple clang versions that ship with Xcode versions that support the 10.13
+ SDK support with builtin, we want to allow building with compilers other
+ than Apple clang that may not support this builtin.
+
+Signed-off-by: Keno Fischer
+Signed-off-by: Michael Roitzsch
+Signed-off-by: Will Cohen
+---
+ hw/9pfs/9p-local.c | 2 +-
+ hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++
+ hw/9pfs/9p-util-linux.c | 6 +++
+ hw/9pfs/9p-util.h | 8 ++++
+ 4 files changed, 111 insertions(+), 1 deletion(-)
+
+diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
+index d42ce6d8b8..b2c1fa42e1 100644
+--- a/hw/9pfs/9p-local.c
++++ b/hw/9pfs/9p-local.c
+@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path,
+ goto out;
+ }
+
+- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW);
++ ret = utimensat_nofollow(dirfd, name, buf);
+ close_preserve_errno(dirfd);
+ out:
+ g_free(dirpath);
+diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c
+index bec0253474..2fc0475292 100644
+--- a/hw/9pfs/9p-util-darwin.c
++++ b/hw/9pfs/9p-util-darwin.c
+@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
+ }
+
+ #endif
++
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
++
++static int update_times_from_stat(int fd, struct timespec times[2],
++ int update0, int update1)
++{
++ struct stat buf;
++ int ret = fstat(fd, &buf);
++ if (ret == -1) {
++ return ret;
++ }
++ if (update0) {
++ times[0] = buf.st_atimespec;
++ }
++ if (update1) {
++ times[1] = buf.st_mtimespec;
++ }
++ return 0;
++}
++
++int utimensat_nofollow(int dirfd, const char *filename,
++ const struct timespec times_in[2])
++{
++ int ret, fd;
++ int special0, special1;
++ struct timeval futimes_buf[2];
++ struct timespec times[2];
++ memcpy(times, times_in, 2 * sizeof(struct timespec));
++
++/* Check whether we have an SDK version that defines utimensat */
++#if defined(__MAC_10_13)
++# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13
++# define UTIMENSAT_AVAILABLE 1
++# elif __has_builtin(__builtin_available)
++# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *)
++# else
++# define UTIMENSAT_AVAILABLE 0
++# endif
++ if (UTIMENSAT_AVAILABLE) {
++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW);
++ }
++#endif
++
++ /* utimensat not available. Use futimes. */
++ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0);
++ if (fd == -1) {
++ return -1;
++ }
++
++ special0 = times[0].tv_nsec == UTIME_OMIT;
++ special1 = times[1].tv_nsec == UTIME_OMIT;
++ if (special0 || special1) {
++ /* If both are set, nothing to do */
++ if (special0 && special1) {
++ ret = 0;
++ goto done;
++ }
++
++ ret = update_times_from_stat(fd, times, special0, special1);
++ if (ret < 0) {
++ goto done;
++ }
++ }
++
++ special0 = times[0].tv_nsec == UTIME_NOW;
++ special1 = times[1].tv_nsec == UTIME_NOW;
++ if (special0 || special1) {
++ ret = futimes(fd, NULL);
++ if (ret < 0) {
++ goto done;
++ }
++
++ /* If both are set, we are done */
++ if (special0 && special1) {
++ ret = 0;
++ goto done;
++ }
++
++ ret = update_times_from_stat(fd, times, special0, special1);
++ if (ret < 0) {
++ goto done;
++ }
++ }
++
++ futimes_buf[0].tv_sec = times[0].tv_sec;
++ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000;
++ futimes_buf[1].tv_sec = times[1].tv_sec;
++ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000;
++ ret = futimes(fd, futimes_buf);
++
++done:
++ close_preserve_errno(fd);
++ return ret;
++}
+diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c
+index db451b0784..320697f347 100644
+--- a/hw/9pfs/9p-util-linux.c
++++ b/hw/9pfs/9p-util-linux.c
+@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
+ {
+ return mknodat(dirfd, filename, mode, dev);
+ }
++
++int utimensat_nofollow(int dirfd, const char *filename,
++ const struct timespec times[2])
++{
++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW);
++}
+diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
+index 1f74d37558..a4b002d1b5 100644
+--- a/hw/9pfs/9p-util.h
++++ b/hw/9pfs/9p-util.h
+@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name,
+ #define qemu_lsetxattr lsetxattr
+ #endif
+
++/* Compatibility with old SDK Versions for Darwin */
++#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW)
++#define UTIME_NOW -1
++#define UTIME_OMIT -2
++#endif
++
+ static inline void close_preserve_errno(int fd)
+ {
+ int serrno = errno;
+@@ -96,6 +102,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename,
+ char *list, size_t size);
+ ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,
+ const char *name);
++int utimensat_nofollow(int dirfd, const char *filename,
++ const struct timespec times[2]);
+
+ /**
+ * Darwin has d_seekoff, which appears to function similarly to d_off.
+--
+2.35.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/rename-9p-util.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/rename-9p-util.patch
new file mode 100644
index 0000000000..fe3e2d7b4b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/rename-9p-util.patch
@@ -0,0 +1,54 @@
+From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001
+From: Keno Fischer
+Date: Sun, 27 Feb 2022 17:35:13 -0500
+Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current file only has the Linux versions of these functions.
+Rename the file accordingly and update the Makefile to only build
+it on Linux. A Darwin version of these will follow later in the
+series.
+
+Signed-off-by: Keno Fischer
+[Michael Roitzsch: - Rebase for NixOS]
+Signed-off-by: Michael Roitzsch
+Signed-off-by: Will Cohen
+Reviewed-by: Greg Kurz
+Reviewed-by: Philippe Mathieu-Daudé
+Message-Id: <20220227223522.91937-3-wwcohen@gmail.com>
+Signed-off-by: Christian Schoenebeck
+---
+ hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0
+ hw/9pfs/meson.build | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%)
+
+diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c
+similarity index 100%
+rename from hw/9pfs/9p-util.c
+rename to hw/9pfs/9p-util-linux.c
+diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
+index 99be5d9119..1b28e70040 100644
+--- a/hw/9pfs/meson.build
++++ b/hw/9pfs/meson.build
+@@ -4,7 +4,6 @@ fs_ss.add(files(
+ '9p-posix-acl.c',
+ '9p-proxy.c',
+ '9p-synth.c',
+- '9p-util.c',
+ '9p-xattr-user.c',
+ '9p-xattr.c',
+ '9p.c',
+@@ -14,6 +13,7 @@ fs_ss.add(files(
+ 'coth.c',
+ 'coxattr.c',
+ ))
++fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
+ fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
+ softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
+
+--
+2.35.1
+
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
index 6ac7377122..6734595265 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec {
pname = "x11docker";
- version = "7.1.0";
+ version = "7.1.1";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
- sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic=";
+ sha256 = "sha256-SUHWqcDL/oDljCpngkhUvzOvMIlZSc1p0j0wjupPBqw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix
index e7cc1a477c..82127c2733 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/berry/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "berry";
- version = "0.1.9";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "JLErvin";
repo = pname;
rev = version;
- hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM=";
+ hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M=";
};
nativeBuildInputs = [
@@ -75,5 +75,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}
-# TODO: report upstream that `which` is not POSIX; the `command` shell builtin
-# should be used instead
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix
index c4a33628e1..4a48225d80 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix
@@ -69,4 +69,7 @@ in
name = "${unwrapped.pname}-${unwrapped.version}";
# export underlying qtile package
passthru = { inherit unwrapped; };
+
+ # restore original qtile attrs
+ inherit (unwrapped) pname version meta;
})
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
index 194525dcff..727d9b4e6b 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
, meson, ninja, pkg-config, wayland-scanner, scdoc
-, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
+, wayland, libxkbcommon, pcre, json_c, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols, libdrm
, nixosTests
@@ -8,8 +8,19 @@
, isNixOS ? false
, enableXWayland ? true
+, systemdSupport ? stdenv.isLinux
+, dbusSupport ? true
+, dbus
+, trayEnabled ? systemdSupport && dbusSupport
}:
+# The "sd-bus-provider" meson option does not include a "none" option,
+# but it is silently ignored iff "-Dtray=disabled". We use "basu"
+# (which is not in nixpkgs) instead of "none" to alert us if this
+# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761
+assert trayEnabled -> systemdSupport && dbusSupport;
+let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
+
stdenv.mkDerivation rec {
pname = "sway-unwrapped";
version = "1.7";
@@ -47,16 +58,18 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- wayland libxkbcommon pcre json_c dbus libevdev
+ wayland libxkbcommon pcre json_c libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg
wayland-protocols libdrm
(wlroots.override { inherit enableXWayland; })
+ ] ++ lib.optionals dbusSupport [
+ dbus
];
- mesonFlags = [
- "-Dsd-bus-provider=libsystemd"
- ]
+ mesonFlags =
+ [ "-Dsd-bus-provider=${sd-bus-provider}" ]
++ lib.optional (!enableXWayland) "-Dxwayland=disabled"
+ ++ lib.optional (!trayEnabled) "-Dtray=disabled"
;
passthru.tests.basic = nixosTests.sway;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
index fd424e3074..0928fbcfb4 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, scdoc, wayland-scanner
-, wayland, wayland-protocols, systemd
+, wayland, wayland-protocols
+, systemdSupport ? stdenv.isLinux, systemd
}:
stdenv.mkDerivation rec {
@@ -15,9 +16,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
- buildInputs = [ wayland wayland-protocols systemd ];
+ buildInputs = [ wayland wayland-protocols ]
+ ++ lib.optionals systemdSupport [ systemd ];
- mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ];
+ mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ];
meta = with lib; {
description = "Idle management daemon for Wayland";
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
index 6dccedad82..b70160b1db 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock.nix
@@ -5,20 +5,15 @@
stdenv.mkDerivation rec {
pname = "swaylock";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swaylock";
rev = version;
- sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf";
+ sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
};
- postPatch = ''
- substituteInPlace meson.build \
- --replace "version: '1.4'" "version: '${version}'"
- '';
-
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix
index 827fce8970..c1f531683d 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix
@@ -8,6 +8,7 @@
, isNixOS ? false
, enableXWayland ? true
+, dbusSupport ? true
}:
assert extraSessionCommands != "" -> withBaseWrapper;
@@ -27,7 +28,7 @@ let
export DBUS_SESSION_BUS_ADDRESS
exec ${sway}/bin/sway "$@"
else
- exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@"
+ exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@"
fi
'';
in symlinkJoin {
diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
index 9ceaab8894..4d302156f7 100644
--- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
@@ -123,7 +123,6 @@ rec {
atk
at-spi2-atk
libudev0-shim
- networkmanager098
xorg.libXt
xorg.libXmu
@@ -180,6 +179,8 @@ rec {
fribidi
p11-kit
+ gmp
+
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
libtool.lib # for Synfigstudio
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
index 55a4993701..2d02767814 100755
--- a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@@ -8,6 +8,8 @@ if [ $# -eq 0 ]; then
fi
pkgs=$1
+tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
+trap 'rm -f "$tmpfile" EXIT
echo "{ fetchNuGet }: ["
@@ -17,7 +19,9 @@ while read pkg_spec; do
sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec")
pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
- echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })"
-done < <(find $1 -name '*.nuspec' | sort)
+ echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" >> ${tmpfile}
+done < <(find $1 -name '*.nuspec')
+
+LC_ALL=C sort --ignore-case ${tmpfile}
echo "]"
diff --git a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix
index e0a57f4aa3..d831fe24d3 100644
--- a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix
@@ -1,4 +1,4 @@
-{ lib, writeTextFile, desktop-file-utils }:
+{ lib, writeTextFile, buildPackages }:
# All possible values as defined by the spec, version 1.4.
# Please keep in spec order for easier maintenance.
@@ -36,7 +36,7 @@
let
# FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands
cleanName = if lib.hasInfix " " name
- then throw "Name must not contain spaces!"
+ then throw "makeDesktopItem: name must not contain spaces!"
else name;
# There are multiple places in the FDO spec that make "boolean" values actually tristate,
@@ -45,13 +45,13 @@ let
boolOrNullToString = value:
if value == null then null
else if builtins.isBool value then lib.boolToString value
- else throw "Value must be a boolean or null!";
+ else throw "makeDesktopItem: value must be a boolean or null!";
# Multiple values are represented as one string, joined by semicolons.
# Technically, it's possible to escape semicolons in values with \;, but this is currently not implemented.
- renderList = value:
- if !builtins.isList value then throw "Value must be a list!"
- else if builtins.any (item: lib.hasInfix ";" item) value then throw "Values in list must not contain semicolons!"
+ renderList = key: value:
+ if !builtins.isList value then throw "makeDesktopItem: value for ${key} must be a list!"
+ else if builtins.any (item: lib.hasInfix ";" item) value then throw "makeDesktopItem: values in ${key} list must not contain semicolons!"
else if value == [] then null
else builtins.concatStringsSep ";" value;
@@ -65,18 +65,18 @@ let
"NoDisplay" = boolOrNullToString noDisplay;
"Comment" = comment;
"Icon" = icon;
- "OnlyShowIn" = renderList onlyShowIn;
- "NotShowIn" = renderList notShowIn;
+ "OnlyShowIn" = renderList "onlyShowIn" onlyShowIn;
+ "NotShowIn" = renderList "notShowIn" notShowIn;
"DBusActivatable" = boolOrNullToString dbusActivatable;
"TryExec" = tryExec;
"Exec" = exec;
"Path" = path;
"Terminal" = boolOrNullToString terminal;
- "Actions" = renderList (builtins.attrNames actions);
- "MimeType" = renderList mimeTypes;
- "Categories" = renderList categories;
- "Implements" = renderList implements;
- "Keywords" = renderList keywords;
+ "Actions" = renderList "actions" (builtins.attrNames actions);
+ "MimeType" = renderList "mimeTypes" mimeTypes;
+ "Categories" = renderList "categories" categories;
+ "Implements" = renderList "implements" implements;
+ "Keywords" = renderList "keywords" keywords;
"StartupNotify" = boolOrNullToString startupNotify;
"StartupWMClass" = startupWMClass;
"URL" = url;
@@ -119,5 +119,5 @@ writeTextFile {
name = "${cleanName}.desktop";
destination = "/share/applications/${cleanName}.desktop";
text = builtins.concatStringsSep "\n" content;
- checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target";
+ checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target";
}
diff --git a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix
index 8c806b87d4..de3d7638eb 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix
@@ -9,8 +9,8 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
- rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67";
- sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr";
+ rev = "763edca12ccd6c67e51f10891d1ced8b2510904f";
+ sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8=";
};
# we only need this if we are using a version that hasn't been released. We
diff --git a/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
index 9689fddd39..8b11e5d504 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix
@@ -2,15 +2,15 @@
stdenvNoCC.mkDerivation {
pname = "google-fonts";
- version = "unstable-2021-06-12";
+ version = "unstable-2022-02-26";
outputs = [ "out" "adobeBlank" ];
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
- rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc";
- sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM=";
+ rev = "2fba0d68602b7eb3374d030c1c34939de56023f9";
+ sha256 = "sha256-IFkKwRRyZeOXD8/9n8UDrruUKK6oQK4BD9wYN2dmSAc=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index 08c4a1b145..3ebaf49abe 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "10.1.0";
+ version = "15.0.1";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index 0ce5212b13..f67f97dfaa 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
- iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1";
- iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn";
- iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc";
- iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b";
- iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51";
- iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf";
- iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj";
- iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb";
- iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8";
- iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4";
- iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7";
- iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9";
- iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x";
- iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv";
- iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw";
- iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7";
- iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h";
- iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h";
- iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix";
- iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6";
- iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am";
- iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i";
- iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9";
- iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716";
- sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm";
- sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57";
- sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj";
- sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr";
- sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4";
- sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m";
- sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712";
- sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw";
- sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq";
- sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g";
- sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b";
- sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd";
- sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v";
- sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1";
- sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5";
- sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv";
- sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a";
- sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg";
- sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd";
- sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684";
- sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp";
- sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2";
- sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58";
- sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn";
- sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an";
- sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5";
- sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n";
- sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8";
- sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4";
- sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9";
- sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr";
- sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9";
- sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n";
- sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2";
- sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q";
- sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk";
- sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq";
- sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69";
- sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616";
- sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52";
- sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh";
- sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3";
- sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp";
- sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8";
- sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns";
- sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2";
- sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj";
- sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc";
- sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1";
- sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw";
- sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2";
- sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd";
- sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd";
- sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd";
- sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n";
- sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd";
- sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q";
- sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw";
- sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r";
- sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1";
- sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw";
- sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1";
- sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc";
- sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2";
- sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx";
- sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk";
- sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r";
- sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6";
+ iosevka = "1g8x2bjhnhiq46mx02rhp0wphi7rj21m1nh2gx6rxly2ybms3pnw";
+ iosevka-aile = "1hvrzycsilvjl3a90n2sk5sznkjvrn9r6yqaad397rbd309w46ai";
+ iosevka-curly = "0df15zbjs9xpqm5032vmjmnp4ay545bs4i8xr6rd37slb8a8x2bf";
+ iosevka-curly-slab = "0n57gz1v12l01khy3y0i0yd4w88jz6izwl4iav4679qjfhhd206c";
+ iosevka-etoile = "1mq1mqxkj5y3r9xwjy7pbrvnv72zkj2hnh48kac0xr414yrqql3n";
+ iosevka-slab = "0srnbwxj03is9d8q0y0k55dr35s747p8xbiz7xany5piljl68f42";
+ iosevka-ss01 = "1rm514g3x510dcpn9hn98kl2pv4h9rxmkgp2wvxxhg3s47x0462n";
+ iosevka-ss02 = "0p8h1khzxsi4c6wmwri9vvbcv2qy4nksnhmyhksb0b8yw22s9iyk";
+ iosevka-ss03 = "1rsw5gx5l5mi8ljvgrrir4bnhy8mvx3rkr9d4vba8wzvvqvc74nv";
+ iosevka-ss04 = "02rcdfrnhqdjlks26968mxsrdyfalk3h985bf9vi03sf9nqmmfpz";
+ iosevka-ss05 = "1qn323iawpvjqhmx6s7i8irjqkxq9yya5dxp87m452hq9zm2jynq";
+ iosevka-ss06 = "0zyg2afzmzdm7gd2c9i9vp751xapajabjm85sri3mcyvgkbcxqai";
+ iosevka-ss07 = "1qfalhxl2vxflwn3f73bdq5q1p8zblmswdfw5mrl3b5nzy8y40nw";
+ iosevka-ss08 = "0idj19nk7mq6z4yphmxa09c5azgxyi38zlq7y872s0dl9j2qbi5f";
+ iosevka-ss09 = "1zwwlb9c34q36kflc6r4wygv3rpkd7y6n1xpkql02w6rb1gp7nd9";
+ iosevka-ss10 = "0j01j7frkv2ldz3hqn65r3b56yn63fchhhkghs95v4cln27qzmxx";
+ iosevka-ss11 = "0imwzcxh7cqmqcsdlg5nay12jql8dq1hk0h7a0i1igrn3fflga5g";
+ iosevka-ss12 = "0z5smyxx5szz5ky4lxmscf44a5pzkjm590cihmcnjw3nxiw84bs1";
+ iosevka-ss13 = "0pyq12n7h1adhs5rbkrx9b64rpwvd9nj8vjmwzf3qmdc39bx6rfv";
+ iosevka-ss14 = "0v3aipgvw1ygs6v839cw17arm5iag57aqdkr35n0wx3yl5h3v9wg";
+ iosevka-ss15 = "0vhwi4b2nmshx7lh5d4fr3swfx58sxwn6w38kvp5p27jp68azbbz";
+ iosevka-ss16 = "1rzrd0swjaacbjpxniglkkwsn4dfhvb8f70g8nigc2mah3md62gp";
+ iosevka-ss17 = "184acjrqdlw38lzizwxp02lwmc8jznrb55krlvrxkd2lkj4r6gni";
+ iosevka-ss18 = "0sza6q6yisjsk5gkkj1z7qbrhpvqv18nykgdwqraa3im66bkl1v9";
+ sgr-iosevka = "1n1i12d9891il20ry3vkv5503d9j541w17imh09dbn5r0lrjr40r";
+ sgr-iosevka-aile = "0y1nx1xk7fn8dj5jc6zyva593vdxngjc61j717jlqh855fpz5v04";
+ sgr-iosevka-curly = "03x2w2arkbhnpl3rlsdgpldqnfrd14q55kf5rf5lsrnmdndg706s";
+ sgr-iosevka-curly-slab = "0vncsw3k56cqzpp5rpllz4azklib0vq7rah0ssz2syh43zffsyw3";
+ sgr-iosevka-etoile = "0plk2c7ckxm0f7aa9wd1qpi3dfb2gap0222jhx906clx04kb6bp0";
+ sgr-iosevka-fixed = "147qjfqwdr0l29ljbn0c73m2wg1vm9qdn5fjika8z1wy7mbrmbsl";
+ sgr-iosevka-fixed-curly = "1222ms9kpgcah531ik7h9qkprpq4dd98p41xrsxad3hvr4aa6x05";
+ sgr-iosevka-fixed-curly-slab = "1fcg0afhan0ym15c10qikfa4hadgzj0aabymac0qq74l5dn8lmx7";
+ sgr-iosevka-fixed-slab = "174xgxrwy50gnm53qhr9mf5cwkbwgalw6ypbz6r68fhyk70dbjvx";
+ sgr-iosevka-fixed-ss01 = "16wpj0yvkavhlvz5xzfa5mr219wlynqlfg1am1y1b9w647ypx6q6";
+ sgr-iosevka-fixed-ss02 = "1ya9riiiphv6fmirg5r0va06xvcgq8j41vmibqrzld7sjk26yrll";
+ sgr-iosevka-fixed-ss03 = "1l6dc7sl5a9p076a7jp2lfwrn1xh0rlp8v3d9k5m9gjghr62b288";
+ sgr-iosevka-fixed-ss04 = "1fmbdjgkvaw30x9wycdfzk9n9c1a2vznx8fnxc3xjps4xw5vd4h3";
+ sgr-iosevka-fixed-ss05 = "1f66q69wgqxqzkf5r54cjqg66lnfpk7w9lf1hk59v3vmxjxy39xh";
+ sgr-iosevka-fixed-ss06 = "1lfjnjn3k6wj03gxpvzc73zj98iy0x447pigxln911ai3v2mcmz5";
+ sgr-iosevka-fixed-ss07 = "0567x6rvikpn2cn9prrym0rlw5swa4rb7wihmhpgal64ygysipq4";
+ sgr-iosevka-fixed-ss08 = "0b81a3841c2fdfrpsiq8cyly9mzrk0974na53b505wasj5jvikqb";
+ sgr-iosevka-fixed-ss09 = "1p5w7m5r11m94icyv8fnwzmpnsih9s8p8iq8hg6iasawqzh60ll3";
+ sgr-iosevka-fixed-ss10 = "0c0dhi2c84km1vhbiifv95x4yf03jz12jax2vvc68hhi3w4gmg68";
+ sgr-iosevka-fixed-ss11 = "10jp3i36sv4jl2887g1ir1dc2gy1iyhzf2f396jchi5dadzfpgwj";
+ sgr-iosevka-fixed-ss12 = "14pq3l6241ylpxlx2n483g1ghlhqahk8dla0frvb572k0bvl4vh5";
+ sgr-iosevka-fixed-ss13 = "0js73rildzz24v4alj2xfl5n5wvmlxk18qzdchzrb78lq6bifvvd";
+ sgr-iosevka-fixed-ss14 = "0f47d6khi5kr10xlm61pbwr1xk5kqgj82abcaxmvbf5c3jj3v1lr";
+ sgr-iosevka-fixed-ss15 = "1nkyfmx4ps8mbnz7ap0vzgwgrxm6nbi4fhvalr6w2dk521inyfn7";
+ sgr-iosevka-fixed-ss16 = "0fykkgksdmni80v3q513xwxnay9l73viwj9qbn4bc58ljzd5hffr";
+ sgr-iosevka-fixed-ss17 = "09n1vl8m2drg5zs05hvdp7yy47a9s927a8ndxqsa34klanz7c04j";
+ sgr-iosevka-fixed-ss18 = "1rmfnnsi9c6alifhnfa4yc9gfgk687zxhrsyrjizwg9r19b2k34m";
+ sgr-iosevka-slab = "1nffh7iy3gn5v2yqilq57x6nvk25jh9jmbdmdfyra19nwfn601ja";
+ sgr-iosevka-ss01 = "1nwl7psz11jnyldry3wa3wfki28wghqq8f7vz8gmmcvv98caga80";
+ sgr-iosevka-ss02 = "1clk233v4ycfqmbv7whmbvm2l1qr1kf75kdca1r4c5y4wjmsh1ap";
+ sgr-iosevka-ss03 = "1lxn8hgz0qxs39d1jvr855h8zi3dv1k56v99q0ivrnp5y7aclia5";
+ sgr-iosevka-ss04 = "03nz6864i5s6gpjy7jjj52062ivd57wh90j6p8x4lj72479fwfsy";
+ sgr-iosevka-ss05 = "1bfgdnc44vmj3hxifz0kb5bfbv3bj9dglp4l7p781chi0m9yrmm8";
+ sgr-iosevka-ss06 = "1zcqq2kv080xsfll6zap3hm2l0kx6sr378iq7qrfpavmfifc3rk8";
+ sgr-iosevka-ss07 = "1phy7gdx5j5rww54mmzvi5f401lxqxxrwmh0hrhl0bvsxybhdcgm";
+ sgr-iosevka-ss08 = "1wyznlzpbv8vb1sny4f1v8x4azfbcp2ajml4aram9k9cx3zkvd8s";
+ sgr-iosevka-ss09 = "0q4sla496pdhfv4v15y5ax0h4pr4n47bfrvs27lq26x4p1fhgwdg";
+ sgr-iosevka-ss10 = "1iyr4vfs2dp26vi26libv5k18mvdnfzmwmvzdczkh8cyc9hwp36d";
+ sgr-iosevka-ss11 = "083pfql4nlq2847csqskb2qxrsnlvfwz198ybnfd97lxa1zczj6k";
+ sgr-iosevka-ss12 = "08isy55m7dqpyhbzf5jkamnr8c135850dwpqp380g991h5sp3vnm";
+ sgr-iosevka-ss13 = "1vjv198pkvnnxxcbyc5fy54ld4phf52nhybqc9hyf8d7806wrvyn";
+ sgr-iosevka-ss14 = "1y4iclzcfb2q0172xag3zqabw03q89jqb7asi0x9zkrhcd1i512y";
+ sgr-iosevka-ss15 = "1zxxn6s418gpx2ndknqdwp132p0sr3smsqhavpl5kw5cxrgxa9q6";
+ sgr-iosevka-ss16 = "132xmf4rlsa3d0j2s9hmfih6s32wm1na0hs72h7padnh6c7di3rl";
+ sgr-iosevka-ss17 = "1bb94ladk0qvzmvb2gc1561xfy7ddgqkqgcgigkkhdab7cfw0cxq";
+ sgr-iosevka-ss18 = "15rrngd4qnzqk06whczsmfdf5c1k3nm4m8ga691i1rjxwc5dwycc";
+ sgr-iosevka-term = "09m74mqczkm0pirahlisdw2mafyzq7wpzplyqg51221x2m01px7z";
+ sgr-iosevka-term-curly = "19ralig26akrabclnniwvimqkcrd0agcwyxakinb7qcbm8p4x30x";
+ sgr-iosevka-term-curly-slab = "01zwrlkrp840ah5fclxxl17vckcx4wnv3vwlz6nch2igy965k6qs";
+ sgr-iosevka-term-slab = "0520d21x04fvc2b3aa6kzdhwvf24s8yd8vkbl400i0x78gyrlnzv";
+ sgr-iosevka-term-ss01 = "0q64vcp4djk0mdfc05a9bz0nqc2a7dr0gdvj2d2kfpbqsg4i32qq";
+ sgr-iosevka-term-ss02 = "0h8a4wc5ck1p7gaf1r08h4irj10kqbpm2jkb2p63gybi9gp6ivwg";
+ sgr-iosevka-term-ss03 = "0608yhvkbv1hkdj7c347r9q7wbm9bvy6lnhhs6gb0ndkx596pnzm";
+ sgr-iosevka-term-ss04 = "1yfpkczgfjfr52ilinzi2dfyw11mmsilxjpl9r9yh0fxmr48c976";
+ sgr-iosevka-term-ss05 = "1brrfhkj7wlyhfdfhafkqw8kgsfy7fsi7567ayxii5b05wn9g6mr";
+ sgr-iosevka-term-ss06 = "0vksv1k9wvyfiifxnajvmi8b5mx8w72d80y3r9ic7rz36l0rbl3x";
+ sgr-iosevka-term-ss07 = "0n5hz3zdp7flbr2xh4yddwkxvpcd0v55m274w15s9q6wln0knwhy";
+ sgr-iosevka-term-ss08 = "1qknqr11imcrr0iqpa9qpf70m7505wl81k48igdyqgmimgksrlji";
+ sgr-iosevka-term-ss09 = "1j53n5fv2y97bj7n4kx8h8v5isflbmgdqh0hz58ilp06v6rd6j5i";
+ sgr-iosevka-term-ss10 = "1bzi39n4x4qa7vyhv5yh875n8gbyjkiaqfhj2xh8pj88b8064cw0";
+ sgr-iosevka-term-ss11 = "0xxyh1zxy1jdy0b110f7rallhf0vicsw0snyh3bf3v0mnkimk0y4";
+ sgr-iosevka-term-ss12 = "1hpbpqnkd4jzcqkg424y3d6i6nn5gyqlpqsfxrvfvx4igmm75vs5";
+ sgr-iosevka-term-ss13 = "12fg2j5xw6vcpczc5kgq6q29cq579l1wyv5ag9r4kxqg541s3frl";
+ sgr-iosevka-term-ss14 = "02qkmzr5kn5p69nqk59j6431313apy861yphbzpy56k4g80j0gy4";
+ sgr-iosevka-term-ss15 = "0pcb91b8iic6blsgz0sw5hv2d9add355dizpvhc6m8rmp6l5pnqq";
+ sgr-iosevka-term-ss16 = "081g07cav6k36k78bmdrx0z9jj2xzx3p1midzsxgsqp3ns2qxk7s";
+ sgr-iosevka-term-ss17 = "1bx7mx75344i4807aq1xk0rw03hnv24wn3kj247hv3b1lxx14285";
+ sgr-iosevka-term-ss18 = "068vy78d710aszk5s9kwf56rxg17qm8pphd329cmwknxsyan139g";
}
diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix
index d19dcba69f..dcff587dd3 100644
--- a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix
@@ -4,6 +4,7 @@
, gtk3
, hicolor-icon-theme
, jdupes
+, gitUpdater
, allColorVariants ? false
, circularFolder ? false
, colorVariants ? [] # default is standard
@@ -16,13 +17,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
stdenvNoCC.mkDerivation rec {
inherit pname;
- version = "2022-02-08";
+ version = "2022-03-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp";
+ sha256 = "vQeWGZmurvT/UQJ1dx6t+ZeKdJ1Oq9TdHBADw64x18g=";
};
nativeBuildInputs = [
@@ -50,16 +51,18 @@ stdenvNoCC.mkDerivation rec {
${lib.optionalString circularFolder "-c"} \
${if allColorVariants then "-a" else builtins.toString colorVariants}
- jdupes -L -r $out/share/icons
+ jdupes --link-soft --recurse $out/share
runHook postInstall
'';
+ passthru.updateScript = gitUpdater {inherit pname version; };
+
meta = with lib; {
description = "Flat and colorful personality icon theme";
homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme";
license = licenses.gpl3Only;
- platforms = platforms.unix;
+ platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches
maintainers = with maintainers; [ romildo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
index 1f84a6fd1e..193c9a60b9 100644
--- a/third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
+++ b/third_party/nixpkgs/pkgs/data/soundfonts/fluid/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "Fluid-3";
+ pname = "Fluid";
+ version = "3";
src = fetchurl {
url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
index 3b44b71213..635b445f61 100644
--- a/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
+++ b/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "ydp-grand";
+ pname = "ydp-grand";
version = "unstable-2016-08-04";
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix b/third_party/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix
index 09f9ecd197..38733590a3 100644
--- a/third_party/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/gnome-breeze/default.nix
@@ -1,12 +1,16 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
- name = "gnome-breeze-20160526";
- src = fetchgit {
- url = "https://github.com/dirruk1/gnome-breeze";
- sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
+ pname = "gnome-breeze";
+ version = "unstable-2016-05-26";
+
+ src = fetchFromGitHub {
+ owner = "dirruk1";
+ repo = "gnome-breeze";
rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
+ sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I=";
};
+
installPhase = ''
mkdir -p $out/share/themes
cp -r Breeze* $out/share/themes
@@ -14,12 +18,12 @@ stdenv.mkDerivation {
preferLocalBuild = true;
- meta = {
+ meta = with lib; {
description = "A GTK theme built to match KDE's breeze theme";
homepage = "https://github.com/dirruk1/gnome-breeze";
- license = lib.licenses.lgpl2;
- maintainers = with lib.maintainers; [ bennofs ];
- platforms = lib.platforms.all;
+ license = licenses.lgpl2;
+ maintainers = with maintainers; [ bennofs ];
+ platforms = platforms.all;
hydraPlatforms = [];
};
}
diff --git a/third_party/nixpkgs/pkgs/data/themes/layan-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/layan-kde/default.nix
new file mode 100644
index 0000000000..40cd6c055b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/themes/layan-kde/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, gitUpdater
+}:
+
+stdenv.mkDerivation rec {
+ pname = "layan-kde";
+ version = "2022-02-13";
+
+ src = fetchFromGitHub {
+ owner = "vinceliuice";
+ repo = pname;
+ rev = version;
+ sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp";
+ };
+
+ postPatch = ''
+ patchShebangs install.sh
+
+ substituteInPlace install.sh \
+ --replace '$HOME/.local' $out \
+ --replace '$HOME/.config' $out/share
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ name= ./install.sh --dest $out/share/themes
+
+ mkdir -p $out/share/sddm/themes
+ cp -a sddm/Layan* $out/share/sddm/themes/
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = gitUpdater {inherit pname version; };
+
+ meta = with lib; {
+ description = "A flat Design theme for KDE Plasma desktop";
+ homepage = "https://github.com/vinceliuice/Layan-kde";
+ license = licenses.gpl3Only;
+ platforms = platforms.all;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
index 64bd3eb5ee..eb62da715c 100644
--- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
- version = "21.10.2";
+ version = "22.04.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
- sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U=";
+ sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs=";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
diff --git a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
index 71b661f126..77650e71eb 100644
--- a/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/cdesktopenv/default.nix
@@ -18,10 +18,10 @@ let
};
in stdenv.mkDerivation rec {
version = "2.3.2";
- name = "cde-${version}";
+ pname = "cde";
src = fetchurl {
- url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz";
+ url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
};
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
index 6a9f4f1938..0725af81c0 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
@@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "gnome-tweaks";
- version = "40.0";
+ version = "40.10";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o=";
+ sha256 = "z/07M6OZV3+7RJHOj70C9UxZJPEFbzARTo1CApDvI/w=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
index e0fc06135e..7874586ce8 100644
--- a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix
@@ -14,13 +14,13 @@
python3Packages.buildPythonApplication rec {
pname = "mate-tweak";
- version = "22.04.1";
+ version = "22.04.4";
src = fetchFromGitHub {
owner = "ubuntu-mate";
repo = pname;
rev = version;
- sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co=";
+ sha256 = "ncBN1wjCcMtuasnXk7WMge+9MK7BMmTu89/R+hiY/Ks=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index 7953105951..e42df9bee0 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -19,7 +19,8 @@ let
testingName = lib.optionalString (testName != null) "${testName}-";
in
stdenv.mkDerivation rec {
- name = "${testingName}${switchboard.name}-with-plugs";
+ pname = "${testingName}${switchboard.pname}-with-plugs";
+ inherit (switchboard) version;
src = null;
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index ca887d45dc..89a359a4c9 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -17,7 +17,8 @@ let
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
stdenv.mkDerivation rec {
- name = "${wingpanel.name}-with-indicators";
+ pname = "${wingpanel.pname}-with-indicators";
+ inherit (wingpanel) version;
src = null;
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
index db1e46f6d4..0474d87599 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "bluedevil";
+ pname = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
qtbase qtdeclarative bluez-qt
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix
index eed396b543..24d0c96cad 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -3,7 +3,7 @@
}:
mkDerivation {
- name = "breeze-grub";
+ pname = "breeze-grub";
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix
index bff3546aa3..b499ab034e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -3,7 +3,7 @@
let inherit (lib) getLib; in
mkDerivation {
- name = "breeze-gtk";
+ pname = "breeze-gtk";
nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ];
buildInputs = [ qtbase ];
patches = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 9127b7fecb..bc60662b43 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -24,7 +24,7 @@ in
mkDerivation {
- name = "breeze-plymouth";
+ pname = "breeze-plymouth";
nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
buildInputs = [ plymouth ];
patches = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix
index 3f3222e05c..13a426bb25 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "breeze-qt5";
+ pname = "breeze-qt5";
sname = "breeze";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
index 072d999b1a..0b71390235 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix
@@ -76,8 +76,8 @@ let
mkDerivation = args:
let
- inherit (args) name;
- sname = args.sname or name;
+ inherit (args) pname;
+ sname = args.sname or pname;
inherit (srcs.${sname}) src version;
outputs = args.outputs or [ "out" ];
@@ -98,8 +98,7 @@ let
};
in
mkDerivation (args // {
- name = "${name}-${version}";
- inherit meta outputs setupHook src;
+ inherit pname version meta outputs setupHook src;
});
};
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
index e065837cd2..dd6c7a3008 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix
@@ -32,7 +32,7 @@
}:
mkDerivation {
- name = "discover";
+ pname = "discover";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ];
buildInputs = [
# discount is needed for libmarkdown
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 47543da111..57800c316a 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "kactivitymanagerd";
+ pname = "kactivitymanagerd";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix
index d84b7bc980..02694b085f 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "kde-cli-tools";
+ pname = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 798f8d807a..6949f73a9c 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "kde-gtk-config";
+ pname = "kde-gtk-config";
nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
index 9b67d7bc52..1427997ee8 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }:
mkDerivation {
- name = "kdecoration";
+ pname = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 77e3cad8d4..5be47327d7 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -8,7 +8,7 @@
}:
mkDerivation {
- name = "kdeplasma-addons";
+ pname = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
index d371ce8151..be5b191c3d 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "kgamma5";
+ pname = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix
index fd36644386..dfd5d4668a 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "khotkeys";
+ pname = "khotkeys";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
index e9b9f51481..662662cdb2 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -9,7 +9,7 @@
}:
mkDerivation {
- name = "kinfocenter";
+ pname = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix
index c0cfebcdc0..6a9d055abe 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "kmenuedit";
+ pname = "kmenuedit";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix
index 11b0f38fed..36eea90573 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreen.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "kscreen";
+ pname = "kscreen";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
index e6c70f8e8c..b37bbc6c84 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "kscreenlocker";
+ pname = "kscreenlocker";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
index bc6702ed6d..4cbf080449 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "ksshaskpass";
+ pname = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksystemstats.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksystemstats.nix
index f117872ce5..d5f96e4298 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/ksystemstats.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/ksystemstats.nix
@@ -4,7 +4,7 @@
}:
mkDerivation {
- name = "ksystemstats";
+ pname = "ksystemstats";
NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix
index 590c523e9d..dcc139bcaf 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }:
mkDerivation {
- name = "kwallet-pam";
+ pname = "kwallet-pam";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ pam socat libgcrypt qtbase kwallet ];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
index 02e963ba90..5462814e8d 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "kwayland-integration";
+ pname = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix
index f24e0e6d6a..e71b98b1b9 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "kwayland-server";
+ pname = "kwayland-server";
nativeBuildInputs = [
cmake
extra-cmake-modules #kdoctools
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index 36f0da9e96..db0485db88 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
@@ -18,7 +18,7 @@
# TODO (ttuegel): investigate qmlplugindump failure
mkDerivation {
- name = "kwin";
+ pname = "kwin";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
index bb8798d2d0..9ba1afaf9f 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "kwrited";
+ pname = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/layer-shell-qt.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/layer-shell-qt.nix
index 9e18bbb4bf..8126377955 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/layer-shell-qt.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/layer-shell-qt.nix
@@ -4,7 +4,7 @@
}:
mkDerivation {
- name = "layer-shell-qt";
+ pname = "layer-shell-qt";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
index ae623a80d7..6798a2cdcb 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -8,7 +8,7 @@
}:
mkDerivation {
- name = "libkscreen";
+ pname = "libkscreen";
nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
index 19bbc6390c..ef4e443844 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "libksysguard";
+ pname = "libksysguard";
patches = [
./0001-qdiriterator-follow-symlinks.patch
];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
index 0e7169abf6..8ae5061436 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/milou.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "milou";
+ pname = "milou";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
index 6eea3c9231..78603c3c30 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/oxygen.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "oxygen";
+ pname = "oxygen";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
index e9ad3c28c1..1ddd844444 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-browser-integration.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "plasma-browser-integration";
+ pname = "plasma-browser-integration";
nativeBuildInputs = [
extra-cmake-modules
];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 457902ad18..6c8d8a3bc4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -17,7 +17,7 @@
}:
mkDerivation {
- name = "plasma-desktop";
+ pname = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix
index f97b061292..8ddd53548e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-disks.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "plasma-disks";
+ pname = "plasma-disks";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix
index f696442876..9febc5172d 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-integration/default.nix
@@ -8,7 +8,7 @@
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
mkDerivation {
- name = "plasma-integration";
+ pname = "plasma-integration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nano/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nano/default.nix
index 0960eec33f..6e2608c7f9 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nano/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nano/default.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "plasma-nano";
+ pname = "plasma-nano";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
plasma-framework
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 5c82112f3b..54c8079cf5 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -11,7 +11,7 @@
}:
mkDerivation {
- name = "plasma-nm";
+ pname = "plasma-nm";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
index bc39e520f8..9e47356579 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "plasma-pa";
+ pname = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-phone-components/default.nix
index d925d7e408..ed0f434025 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-phone-components/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-phone-components/default.nix
@@ -16,7 +16,7 @@
let inherit (lib) getBin getLib; in
mkDerivation {
- name = "plasma-phone-components";
+ pname = "plasma-phone-components";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix
index e82fc4d060..8ab2d635b2 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix
@@ -20,7 +20,7 @@
}:
mkDerivation {
- name = "plasma-sdk";
+ pname = "plasma-sdk";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
index f69808bf45..da5ad45df9 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
@@ -15,7 +15,7 @@
}:
mkDerivation {
- name = "plasma-systemmonitor";
+ pname = "plasma-systemmonitor";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtquickcontrols2
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
index 1bb79c327e..c35f1bf097 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-thunderbolt.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "plasma-thunderbolt";
+ pname = "plasma-thunderbolt";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcmutils
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix
index 453ba2b107..b6ceb37a71 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-vault/default.nix
@@ -14,7 +14,7 @@
}:
mkDerivation {
- name = "plasma-vault";
+ pname = "plasma-vault";
nativeBuildInputs = [ extra-cmake-modules ];
patches = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index cb068166c1..8ae136ac78 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,6 +1,6 @@
{ mkDerivation , extra-cmake-modules }:
mkDerivation {
- name = "plasma-workspace-wallpapers";
+ pname = "plasma-workspace-wallpapers";
nativeBuildInputs = [ extra-cmake-modules ];
}
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index fac10cf31d..68b6d1d675 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -23,7 +23,7 @@
let inherit (lib) getBin getLib; in
mkDerivation {
- name = "plasma-workspace";
+ pname = "plasma-workspace";
passthru.providedSessions = [ "plasma" "plasmawayland" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 72217204b3..82ebf3e313 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -5,7 +5,7 @@
}:
mkDerivation {
- name = "polkit-kde-agent";
+ pname = "polkit-kde-agent";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
index 9d2dc183cf..229810edde 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/powerdevil.nix
@@ -7,7 +7,7 @@
}:
mkDerivation {
- name = "powerdevil";
+ pname = "powerdevil";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
index 420529eb17..a45488c287 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/qqc2-breeze-style.nix
@@ -12,7 +12,7 @@
}:
mkDerivation {
- name = "qqc2-breeze-style";
+ pname = "qqc2-breeze-style";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
index 7c44e0f140..50801d3177 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix
@@ -17,7 +17,7 @@
}:
mkDerivation {
- name = "sddm-kcm";
+ pname = "sddm-kcm";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
libpthreadstubs
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix
index 9ff906f797..c83bbcecf5 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix
@@ -6,7 +6,7 @@
}:
mkDerivation {
- name = "systemsettings";
+ pname = "systemsettings";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 60d4867cb4..00533367d4 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -8,7 +8,7 @@
}:
mkDerivation {
- name = "xdg-desktop-portal-kde";
+ pname = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
buildInputs = [
cups libepoxy mesa pcre pipewire wayland wayland-protocols
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
index 4743099506..fb070ed365 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
@@ -3,8 +3,8 @@
mkXfceDerivation {
category = "panel-plugins";
pname = "xfce4-cpufreq-plugin";
- version = "1.2.6";
- sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc=";
+ version = "1.2.7";
+ sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY=";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
index d650d767a8..05fb8b6b17 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, src, version }:
stdenv.mkDerivation rec {
inherit src version;
- name = "ocaml-${version}+bs";
+ pname = "ocaml-bs";
configurePhase = ''
./configure -prefix $out
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/edk2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/edk2/default.nix
index e60d647f6d..47ea90482b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/edk2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/edk2/default.nix
@@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then
edk2 = buildStdenv.mkDerivation {
pname = "edk2";
- version = "202108";
+ version = "202202";
# submodules
src = fetchFromGitHub {
@@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation {
repo = "edk2";
rev = "edk2-stable${edk2.version}";
fetchSubmodules = true;
- sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
+ sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d";
};
- patches = [
- # Pull upstream fix for gcc-11 build.
- (fetchpatch {
- name = "gcc-11-vla.patch";
- url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch";
- sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj";
- # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/"
- stripLen = 1;
- extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/";
- })
- ];
-
buildInputs = [ libuuid pythonEnv ];
makeFlags = [ "-C BaseTools" ]
@@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation {
meta = with lib; {
description = "Intel EFI development kit";
- homepage = "https://sourceforge.net/projects/edk2/";
+ homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
license = licenses.bsd2;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ];
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
index 891751a6ad..3f704b5257 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
- version = "0.19.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pJ4RSijuwdKAL24WzcDIQen1RGofN1tUlbAA18zUvBE=";
+ sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA=";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
- cargoSha256 = "sha256-f/6LdvKRykpBX2GlRuyUcSD719f6XzhbMHzhrGNU0Cg=";
+ cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix
index 2b7c6a2f07..25bedd397b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, testVersion }:
-buildGoModule rec {
+let self = buildGoModule rec {
pname = "go-jsonnet";
version = "0.18.0";
@@ -15,12 +15,19 @@ buildGoModule rec {
doCheck = false;
- subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ];
+ subPackages = [ "cmd/jsonnet*" ];
+
+ passthru.tests.version = testVersion {
+ package = self;
+ version = "v${version}";
+ };
meta = with lib; {
description = "An implementation of Jsonnet in pure Go";
homepage = "https://github.com/google/go-jsonnet";
license = licenses.asl20;
- maintainers = with maintainers; [ nshalman ];
+ maintainers = with maintainers; [ nshalman aaronjheng ];
+ mainProgram = "jsonnet";
};
-}
+};
+in self
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
index 688ca15177..ea1af60993 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -4,7 +4,7 @@
automake, autoconf, libtool, clangStdenv } :
clangStdenv.mkDerivation rec {
- name = "ios-cross-compile-${version}";
+ pname = "ios-cross-compile";
version = "9.2";
sdk = "iPhoneOS9.2.sdk";
cctools_port = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix
index 6f4a0d8ee7..5a91fb17fe 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix
@@ -19,7 +19,7 @@
let
release_version = "14.0.0";
- candidate = "rc1"; # empty or "rcN"
+ candidate = "rc2"; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
@@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
- sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E=";
+ sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w=";
};
llvm_meta = {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
index c67f8d2f72..75b3d1128e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix
@@ -12,7 +12,8 @@ let
"-x86-64";
in
stdenv.mkDerivation {
- name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
+ pname = "mit-scheme" + lib.optionalString enableX11 "-x11";
+ inherit version;
# MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
# the platform-specific tarballs, which contain pre-built binaries. It
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
index 78dec7885d..02f6da928c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix
@@ -7,7 +7,7 @@
let
jre = stdenv.mkDerivation {
- name = "${jdk.name}-minimal-jre";
+ pname = "${jdk.pname}-minimal-jre";
version = jdk.version;
buildInputs = [ jdk ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix
index 736a9d3c34..53b05c16d9 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/osl/default.nix
@@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; };
in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
- name = "openshadinglanguage-${version}";
+ pname = "openshadinglanguage";
version = "1.10.9";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh b/third_party/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh
index 5bdc37956b..f5da4acd8b 100755
--- a/third_party/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh
+++ b/third_party/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh
@@ -48,7 +48,7 @@ do
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
cat << EOL
{
- name = "$package";
+ pname = "$package";
version = "$version";
src = fetchurl {
url = "$url";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix b/third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix
index df07eea54e..69cca6b13d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/roslyn/default.nix
@@ -13,8 +13,7 @@
let
deps = map (package: stdenv.mkDerivation (with package; {
- pname = name;
- inherit version src;
+ inherit pname version src;
buildInputs = [ unzip ];
unpackPhase = ''
@@ -40,7 +39,7 @@ let
installPhase = ''
runHook preInstall
- package=$out/lib/dotnet/${name}/${version}
+ package=$out/lib/dotnet/${pname}/${version}
mkdir -p $package
cp -r . $package
echo "{}" > $package/.nupkg.metadata
diff --git a/third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix
index b08bd0740a..61835f74e7 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/roslyn/deps.nix
@@ -1,6 +1,6 @@
{ fetchurl }: [
{
- name = "microsoft.aspnetcore.app.ref";
+ pname = "microsoft.aspnetcore.app.ref";
version = "3.1.10";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg";
@@ -8,7 +8,7 @@
};
}
{
- name = "microsoft.build.framework";
+ pname = "microsoft.build.framework";
version = "15.3.409";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.3.409/microsoft.build.framework.15.3.409.nupkg";
@@ -16,7 +16,7 @@
};
}
{
- name = "microsoft.build.tasks.core";
+ pname = "microsoft.build.tasks.core";
version = "15.3.409";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/15.3.409/microsoft.build.tasks.core.15.3.409.nupkg";
@@ -24,7 +24,7 @@
};
}
{
- name = "microsoft.build.tasks.git";
+ pname = "microsoft.build.tasks.git";
version = "1.1.0-beta-20206-02";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg";
@@ -32,7 +32,7 @@
};
}
{
- name = "microsoft.build.utilities.core";
+ pname = "microsoft.build.utilities.core";
version = "15.3.409";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.3.409/microsoft.build.utilities.core.15.3.409.nupkg";
@@ -40,7 +40,7 @@
};
}
{
- name = "microsoft.codeanalysis.analyzers";
+ pname = "microsoft.codeanalysis.analyzers";
version = "3.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg";
@@ -48,7 +48,7 @@
};
}
{
- name = "microsoft.codeanalysis.bannedapianalyzers";
+ pname = "microsoft.codeanalysis.bannedapianalyzers";
version = "3.3.2-beta1.20562.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.bannedapianalyzers.3.3.2-beta1.20562.1.nupkg";
@@ -56,7 +56,7 @@
};
}
{
- name = "microsoft.codeanalysis.common";
+ pname = "microsoft.codeanalysis.common";
version = "3.8.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg";
@@ -64,7 +64,7 @@
};
}
{
- name = "microsoft.codeanalysis.csharp.codestyle";
+ pname = "microsoft.codeanalysis.csharp.codestyle";
version = "3.8.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp.codestyle/3.8.0/microsoft.codeanalysis.csharp.codestyle.3.8.0.nupkg";
@@ -72,7 +72,7 @@
};
}
{
- name = "microsoft.codeanalysis.netanalyzers";
+ pname = "microsoft.codeanalysis.netanalyzers";
version = "6.0.0-preview1.21054.10";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-preview1.21054.10/microsoft.codeanalysis.netanalyzers.6.0.0-preview1.21054.10.nupkg";
@@ -80,7 +80,7 @@
};
}
{
- name = "microsoft.codeanalysis.performancesensitiveanalyzers";
+ pname = "microsoft.codeanalysis.performancesensitiveanalyzers";
version = "3.3.2-beta1.20562.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.2-beta1.20562.1.nupkg";
@@ -88,7 +88,7 @@
};
}
{
- name = "microsoft.codeanalysis.publicapianalyzers";
+ pname = "microsoft.codeanalysis.publicapianalyzers";
version = "3.3.2-beta1.20562.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.publicapianalyzers.3.3.2-beta1.20562.1.nupkg";
@@ -96,7 +96,7 @@
};
}
{
- name = "microsoft.codeanalysis.visualbasic.codestyle";
+ pname = "microsoft.codeanalysis.visualbasic.codestyle";
version = "3.8.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.visualbasic.codestyle/3.8.0/microsoft.codeanalysis.visualbasic.codestyle.3.8.0.nupkg";
@@ -104,7 +104,7 @@
};
}
{
- name = "microsoft.csharp";
+ pname = "microsoft.csharp";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg";
@@ -112,7 +112,7 @@
};
}
{
- name = "microsoft.diasymreader.native";
+ pname = "microsoft.diasymreader.native";
version = "16.9.0-beta1.21055.5";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/16.9.0-beta1.21055.5/microsoft.diasymreader.native.16.9.0-beta1.21055.5.nupkg";
@@ -120,7 +120,7 @@
};
}
{
- name = "microsoft.dotnet.arcade.sdk";
+ pname = "microsoft.dotnet.arcade.sdk";
version = "1.0.0-beta.21072.7";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/1.0.0-beta.21072.7/microsoft.dotnet.arcade.sdk.1.0.0-beta.21072.7.nupkg";
@@ -128,7 +128,7 @@
};
}
{
- name = "microsoft.net.compilers.toolset";
+ pname = "microsoft.net.compilers.toolset";
version = "3.10.0-1.21101.2";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.10.0-1.21101.2/microsoft.net.compilers.toolset.3.10.0-1.21101.2.nupkg";
@@ -136,7 +136,7 @@
};
}
{
- name = "microsoft.netcore.app.host.linux-x64";
+ pname = "microsoft.netcore.app.host.linux-x64";
version = "3.1.21";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg";
@@ -144,7 +144,7 @@
};
}
{
- name = "microsoft.netcore.app.host.linux-arm64";
+ pname = "microsoft.netcore.app.host.linux-arm64";
version = "3.1.21";
src = fetchurl {
url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg";
@@ -152,7 +152,7 @@
};
}
{
- name = "microsoft.netcore.app.ref";
+ pname = "microsoft.netcore.app.ref";
version = "3.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg";
@@ -160,7 +160,7 @@
};
}
{
- name = "microsoft.netcore.platforms";
+ pname = "microsoft.netcore.platforms";
version = "1.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg";
@@ -168,7 +168,7 @@
};
}
{
- name = "microsoft.netcore.platforms";
+ pname = "microsoft.netcore.platforms";
version = "1.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg";
@@ -176,7 +176,7 @@
};
}
{
- name = "microsoft.netcore.platforms";
+ pname = "microsoft.netcore.platforms";
version = "2.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg";
@@ -184,7 +184,7 @@
};
}
{
- name = "microsoft.netcore.platforms";
+ pname = "microsoft.netcore.platforms";
version = "2.1.2";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg";
@@ -192,7 +192,7 @@
};
}
{
- name = "microsoft.netcore.targets";
+ pname = "microsoft.netcore.targets";
version = "1.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg";
@@ -200,7 +200,7 @@
};
}
{
- name = "microsoft.netcore.targets";
+ pname = "microsoft.netcore.targets";
version = "1.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg";
@@ -208,7 +208,7 @@
};
}
{
- name = "microsoft.netframework.referenceassemblies";
+ pname = "microsoft.netframework.referenceassemblies";
version = "1.0.0-preview.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0-preview.1/microsoft.netframework.referenceassemblies.1.0.0-preview.1.nupkg";
@@ -216,7 +216,7 @@
};
}
{
- name = "microsoft.netframework.referenceassemblies.net472";
+ pname = "microsoft.netframework.referenceassemblies.net472";
version = "1.0.0-preview.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0-preview.1/microsoft.netframework.referenceassemblies.net472.1.0.0-preview.1.nupkg";
@@ -224,7 +224,7 @@
};
}
{
- name = "microsoft.sourcelink.azurerepos.git";
+ pname = "microsoft.sourcelink.azurerepos.git";
version = "1.1.0-beta-20206-02";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg";
@@ -232,7 +232,7 @@
};
}
{
- name = "microsoft.sourcelink.common";
+ pname = "microsoft.sourcelink.common";
version = "1.1.0-beta-20206-02";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg";
@@ -240,7 +240,7 @@
};
}
{
- name = "microsoft.sourcelink.github";
+ pname = "microsoft.sourcelink.github";
version = "1.1.0-beta-20206-02";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg";
@@ -248,7 +248,7 @@
};
}
{
- name = "microsoft.visualstudio.threading.analyzers";
+ pname = "microsoft.visualstudio.threading.analyzers";
version = "16.8.55";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/16.8.55/microsoft.visualstudio.threading.analyzers.16.8.55.nupkg";
@@ -256,7 +256,7 @@
};
}
{
- name = "microsoft.win32.primitives";
+ pname = "microsoft.win32.primitives";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg";
@@ -264,7 +264,7 @@
};
}
{
- name = "microsoft.win32.registry";
+ pname = "microsoft.win32.registry";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg";
@@ -272,7 +272,7 @@
};
}
{
- name = "netstandard.library";
+ pname = "netstandard.library";
version = "2.0.3";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg";
@@ -280,7 +280,7 @@
};
}
{
- name = "richcodenav.envvardump";
+ pname = "richcodenav.envvardump";
version = "0.1.1643-alpha";
src = fetchurl {
url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg";
@@ -288,7 +288,7 @@
};
}
{
- name = "roslyn.diagnostics.analyzers";
+ pname = "roslyn.diagnostics.analyzers";
version = "3.3.2-beta1.20562.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.2-beta1.20562.1/roslyn.diagnostics.analyzers.3.3.2-beta1.20562.1.nupkg";
@@ -296,7 +296,7 @@
};
}
{
- name = "runtime.native.system";
+ pname = "runtime.native.system";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg";
@@ -304,7 +304,7 @@
};
}
{
- name = "runtime.native.system.net.http";
+ pname = "runtime.native.system.net.http";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg";
@@ -312,7 +312,7 @@
};
}
{
- name = "runtime.native.system.security.cryptography";
+ pname = "runtime.native.system.security.cryptography";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg";
@@ -320,7 +320,7 @@
};
}
{
- name = "system.appcontext";
+ pname = "system.appcontext";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg";
@@ -328,7 +328,7 @@
};
}
{
- name = "system.buffers";
+ pname = "system.buffers";
version = "4.5.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg";
@@ -336,7 +336,7 @@
};
}
{
- name = "system.collections";
+ pname = "system.collections";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg";
@@ -344,7 +344,7 @@
};
}
{
- name = "system.collections";
+ pname = "system.collections";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg";
@@ -352,7 +352,7 @@
};
}
{
- name = "system.collections.concurrent";
+ pname = "system.collections.concurrent";
version = "4.0.12";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg";
@@ -360,7 +360,7 @@
};
}
{
- name = "system.collections.immutable";
+ pname = "system.collections.immutable";
version = "1.2.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg";
@@ -368,7 +368,7 @@
};
}
{
- name = "system.collections.immutable";
+ pname = "system.collections.immutable";
version = "1.3.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.3.1/system.collections.immutable.1.3.1.nupkg";
@@ -376,7 +376,7 @@
};
}
{
- name = "system.collections.immutable";
+ pname = "system.collections.immutable";
version = "5.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg";
@@ -384,7 +384,7 @@
};
}
{
- name = "system.collections.nongeneric";
+ pname = "system.collections.nongeneric";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg";
@@ -392,7 +392,7 @@
};
}
{
- name = "system.console";
+ pname = "system.console";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg";
@@ -400,7 +400,7 @@
};
}
{
- name = "system.diagnostics.debug";
+ pname = "system.diagnostics.debug";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg";
@@ -408,7 +408,7 @@
};
}
{
- name = "system.diagnostics.debug";
+ pname = "system.diagnostics.debug";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg";
@@ -416,7 +416,7 @@
};
}
{
- name = "system.diagnostics.process";
+ pname = "system.diagnostics.process";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg";
@@ -424,7 +424,7 @@
};
}
{
- name = "system.diagnostics.tools";
+ pname = "system.diagnostics.tools";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg";
@@ -432,7 +432,7 @@
};
}
{
- name = "system.diagnostics.tracesource";
+ pname = "system.diagnostics.tracesource";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg";
@@ -440,7 +440,7 @@
};
}
{
- name = "system.diagnostics.tracing";
+ pname = "system.diagnostics.tracing";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg";
@@ -448,7 +448,7 @@
};
}
{
- name = "system.dynamic.runtime";
+ pname = "system.dynamic.runtime";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg";
@@ -456,7 +456,7 @@
};
}
{
- name = "system.globalization";
+ pname = "system.globalization";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg";
@@ -464,7 +464,7 @@
};
}
{
- name = "system.globalization";
+ pname = "system.globalization";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg";
@@ -472,7 +472,7 @@
};
}
{
- name = "system.globalization.calendars";
+ pname = "system.globalization.calendars";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg";
@@ -480,7 +480,7 @@
};
}
{
- name = "system.io";
+ pname = "system.io";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg";
@@ -488,7 +488,7 @@
};
}
{
- name = "system.io";
+ pname = "system.io";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg";
@@ -496,7 +496,7 @@
};
}
{
- name = "system.io.filesystem";
+ pname = "system.io.filesystem";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg";
@@ -504,7 +504,7 @@
};
}
{
- name = "system.io.filesystem.primitives";
+ pname = "system.io.filesystem.primitives";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg";
@@ -512,7 +512,7 @@
};
}
{
- name = "system.io.pipes.accesscontrol";
+ pname = "system.io.pipes.accesscontrol";
version = "4.5.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/4.5.1/system.io.pipes.accesscontrol.4.5.1.nupkg";
@@ -520,7 +520,7 @@
};
}
{
- name = "system.linq";
+ pname = "system.linq";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg";
@@ -528,7 +528,7 @@
};
}
{
- name = "system.linq";
+ pname = "system.linq";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg";
@@ -536,7 +536,7 @@
};
}
{
- name = "system.linq.expressions";
+ pname = "system.linq.expressions";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg";
@@ -544,7 +544,7 @@
};
}
{
- name = "system.linq.parallel";
+ pname = "system.linq.parallel";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg";
@@ -552,7 +552,7 @@
};
}
{
- name = "system.memory";
+ pname = "system.memory";
version = "4.5.4";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg";
@@ -560,7 +560,7 @@
};
}
{
- name = "system.numerics.vectors";
+ pname = "system.numerics.vectors";
version = "4.4.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg";
@@ -568,7 +568,7 @@
};
}
{
- name = "system.numerics.vectors";
+ pname = "system.numerics.vectors";
version = "4.5.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg";
@@ -576,7 +576,7 @@
};
}
{
- name = "system.objectmodel";
+ pname = "system.objectmodel";
version = "4.0.12";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg";
@@ -584,7 +584,7 @@
};
}
{
- name = "system.objectmodel";
+ pname = "system.objectmodel";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg";
@@ -592,7 +592,7 @@
};
}
{
- name = "system.private.datacontractserialization";
+ pname = "system.private.datacontractserialization";
version = "4.1.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg";
@@ -600,7 +600,7 @@
};
}
{
- name = "system.reflection";
+ pname = "system.reflection";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg";
@@ -608,7 +608,7 @@
};
}
{
- name = "system.reflection";
+ pname = "system.reflection";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg";
@@ -616,7 +616,7 @@
};
}
{
- name = "system.reflection.emit";
+ pname = "system.reflection.emit";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg";
@@ -624,7 +624,7 @@
};
}
{
- name = "system.reflection.emit";
+ pname = "system.reflection.emit";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg";
@@ -632,7 +632,7 @@
};
}
{
- name = "system.reflection.emit.ilgeneration";
+ pname = "system.reflection.emit.ilgeneration";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg";
@@ -640,7 +640,7 @@
};
}
{
- name = "system.reflection.emit.ilgeneration";
+ pname = "system.reflection.emit.ilgeneration";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg";
@@ -648,7 +648,7 @@
};
}
{
- name = "system.reflection.emit.lightweight";
+ pname = "system.reflection.emit.lightweight";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg";
@@ -656,7 +656,7 @@
};
}
{
- name = "system.reflection.emit.lightweight";
+ pname = "system.reflection.emit.lightweight";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg";
@@ -664,7 +664,7 @@
};
}
{
- name = "system.reflection.extensions";
+ pname = "system.reflection.extensions";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg";
@@ -672,7 +672,7 @@
};
}
{
- name = "system.reflection.extensions";
+ pname = "system.reflection.extensions";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg";
@@ -680,7 +680,7 @@
};
}
{
- name = "system.reflection.metadata";
+ pname = "system.reflection.metadata";
version = "1.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg";
@@ -688,7 +688,7 @@
};
}
{
- name = "system.reflection.metadata";
+ pname = "system.reflection.metadata";
version = "5.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg";
@@ -696,7 +696,7 @@
};
}
{
- name = "system.reflection.primitives";
+ pname = "system.reflection.primitives";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg";
@@ -704,7 +704,7 @@
};
}
{
- name = "system.reflection.primitives";
+ pname = "system.reflection.primitives";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg";
@@ -712,7 +712,7 @@
};
}
{
- name = "system.reflection.typeextensions";
+ pname = "system.reflection.typeextensions";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg";
@@ -720,7 +720,7 @@
};
}
{
- name = "system.reflection.typeextensions";
+ pname = "system.reflection.typeextensions";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg";
@@ -728,7 +728,7 @@
};
}
{
- name = "system.resources.reader";
+ pname = "system.resources.reader";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg";
@@ -736,7 +736,7 @@
};
}
{
- name = "system.resources.resourcemanager";
+ pname = "system.resources.resourcemanager";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg";
@@ -744,7 +744,7 @@
};
}
{
- name = "system.resources.resourcemanager";
+ pname = "system.resources.resourcemanager";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg";
@@ -752,7 +752,7 @@
};
}
{
- name = "system.resources.writer";
+ pname = "system.resources.writer";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg";
@@ -760,7 +760,7 @@
};
}
{
- name = "system.runtime";
+ pname = "system.runtime";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg";
@@ -768,7 +768,7 @@
};
}
{
- name = "system.runtime";
+ pname = "system.runtime";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg";
@@ -776,7 +776,7 @@
};
}
{
- name = "system.runtime.compilerservices.unsafe";
+ pname = "system.runtime.compilerservices.unsafe";
version = "4.7.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg";
@@ -784,7 +784,7 @@
};
}
{
- name = "system.runtime.compilerservices.unsafe";
+ pname = "system.runtime.compilerservices.unsafe";
version = "5.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg";
@@ -792,7 +792,7 @@
};
}
{
- name = "system.runtime.extensions";
+ pname = "system.runtime.extensions";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg";
@@ -800,7 +800,7 @@
};
}
{
- name = "system.runtime.extensions";
+ pname = "system.runtime.extensions";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg";
@@ -808,7 +808,7 @@
};
}
{
- name = "system.runtime.handles";
+ pname = "system.runtime.handles";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg";
@@ -816,7 +816,7 @@
};
}
{
- name = "system.runtime.handles";
+ pname = "system.runtime.handles";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg";
@@ -824,7 +824,7 @@
};
}
{
- name = "system.runtime.interopservices";
+ pname = "system.runtime.interopservices";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg";
@@ -832,7 +832,7 @@
};
}
{
- name = "system.runtime.interopservices";
+ pname = "system.runtime.interopservices";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg";
@@ -840,7 +840,7 @@
};
}
{
- name = "system.runtime.interopservices.runtimeinformation";
+ pname = "system.runtime.interopservices.runtimeinformation";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg";
@@ -848,7 +848,7 @@
};
}
{
- name = "system.runtime.interopservices.runtimeinformation";
+ pname = "system.runtime.interopservices.runtimeinformation";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg";
@@ -856,7 +856,7 @@
};
}
{
- name = "system.runtime.loader";
+ pname = "system.runtime.loader";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg";
@@ -864,7 +864,7 @@
};
}
{
- name = "system.runtime.numerics";
+ pname = "system.runtime.numerics";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg";
@@ -872,7 +872,7 @@
};
}
{
- name = "system.runtime.serialization.primitives";
+ pname = "system.runtime.serialization.primitives";
version = "4.1.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg";
@@ -880,7 +880,7 @@
};
}
{
- name = "system.runtime.serialization.xml";
+ pname = "system.runtime.serialization.xml";
version = "4.1.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg";
@@ -888,7 +888,7 @@
};
}
{
- name = "system.security.accesscontrol";
+ pname = "system.security.accesscontrol";
version = "4.5.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg";
@@ -896,7 +896,7 @@
};
}
{
- name = "system.security.cryptography.algorithms";
+ pname = "system.security.cryptography.algorithms";
version = "4.2.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg";
@@ -904,7 +904,7 @@
};
}
{
- name = "system.security.cryptography.cng";
+ pname = "system.security.cryptography.cng";
version = "4.2.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg";
@@ -912,7 +912,7 @@
};
}
{
- name = "system.security.cryptography.csp";
+ pname = "system.security.cryptography.csp";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg";
@@ -920,7 +920,7 @@
};
}
{
- name = "system.security.cryptography.encoding";
+ pname = "system.security.cryptography.encoding";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg";
@@ -928,7 +928,7 @@
};
}
{
- name = "system.security.cryptography.openssl";
+ pname = "system.security.cryptography.openssl";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg";
@@ -936,7 +936,7 @@
};
}
{
- name = "system.security.cryptography.primitives";
+ pname = "system.security.cryptography.primitives";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg";
@@ -944,7 +944,7 @@
};
}
{
- name = "system.security.cryptography.x509certificates";
+ pname = "system.security.cryptography.x509certificates";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg";
@@ -952,7 +952,7 @@
};
}
{
- name = "system.security.principal.windows";
+ pname = "system.security.principal.windows";
version = "4.5.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg";
@@ -960,7 +960,7 @@
};
}
{
- name = "system.text.encoding";
+ pname = "system.text.encoding";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg";
@@ -968,7 +968,7 @@
};
}
{
- name = "system.text.encoding";
+ pname = "system.text.encoding";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg";
@@ -976,7 +976,7 @@
};
}
{
- name = "system.text.encoding.codepages";
+ pname = "system.text.encoding.codepages";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg";
@@ -984,7 +984,7 @@
};
}
{
- name = "system.text.encoding.codepages";
+ pname = "system.text.encoding.codepages";
version = "4.5.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg";
@@ -992,7 +992,7 @@
};
}
{
- name = "system.text.encoding.extensions";
+ pname = "system.text.encoding.extensions";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg";
@@ -1000,7 +1000,7 @@
};
}
{
- name = "system.text.regularexpressions";
+ pname = "system.text.regularexpressions";
version = "4.1.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg";
@@ -1008,7 +1008,7 @@
};
}
{
- name = "system.threading";
+ pname = "system.threading";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg";
@@ -1016,7 +1016,7 @@
};
}
{
- name = "system.threading";
+ pname = "system.threading";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg";
@@ -1024,7 +1024,7 @@
};
}
{
- name = "system.threading.tasks";
+ pname = "system.threading.tasks";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg";
@@ -1032,7 +1032,7 @@
};
}
{
- name = "system.threading.tasks";
+ pname = "system.threading.tasks";
version = "4.3.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg";
@@ -1040,7 +1040,7 @@
};
}
{
- name = "system.threading.tasks.extensions";
+ pname = "system.threading.tasks.extensions";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg";
@@ -1048,7 +1048,7 @@
};
}
{
- name = "system.threading.tasks.extensions";
+ pname = "system.threading.tasks.extensions";
version = "4.5.4";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg";
@@ -1056,7 +1056,7 @@
};
}
{
- name = "system.threading.thread";
+ pname = "system.threading.thread";
version = "4.0.0";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg";
@@ -1064,7 +1064,7 @@
};
}
{
- name = "system.threading.threadpool";
+ pname = "system.threading.threadpool";
version = "4.0.10";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg";
@@ -1072,7 +1072,7 @@
};
}
{
- name = "system.threading.timer";
+ pname = "system.threading.timer";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg";
@@ -1080,7 +1080,7 @@
};
}
{
- name = "system.xml.readerwriter";
+ pname = "system.xml.readerwriter";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg";
@@ -1088,7 +1088,7 @@
};
}
{
- name = "system.xml.xdocument";
+ pname = "system.xml.xdocument";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg";
@@ -1096,7 +1096,7 @@
};
}
{
- name = "system.xml.xmldocument";
+ pname = "system.xml.xmldocument";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg";
@@ -1104,7 +1104,7 @@
};
}
{
- name = "system.xml.xmlserializer";
+ pname = "system.xml.xmlserializer";
version = "4.0.11";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg";
@@ -1112,7 +1112,7 @@
};
}
{
- name = "system.xml.xpath";
+ pname = "system.xml.xpath";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg";
@@ -1120,7 +1120,7 @@
};
}
{
- name = "system.xml.xpath.xmldocument";
+ pname = "system.xml.xpath.xmldocument";
version = "4.0.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xmldocument/4.0.1/system.xml.xpath.xmldocument.4.0.1.nupkg";
@@ -1128,7 +1128,7 @@
};
}
{
- name = "xlifftasks";
+ pname = "xlifftasks";
version = "1.0.0-beta.20206.1";
src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20206.1/xlifftasks.1.0.0-beta.20206.1.nupkg";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix
index a3597e9feb..23b8e7effe 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/clippy.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
rustPlatform.buildRustPackage {
- name = "clippy-${rustc.version}";
+ pname = "clippy";
inherit (rustc) version src;
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
index 2071c48cc6..b859d01dc0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -1,4 +1,4 @@
-{ buildPackages, callPackage, stdenv }@prev:
+{ buildPackages, callPackage, stdenv, runCommand }@prev:
{ rustc, cargo, stdenv ? prev.stdenv, ... }:
@@ -21,11 +21,11 @@ rec {
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
rustcSrc = callPackage ./rust-src.nix {
- inherit stdenv rustc;
+ inherit runCommand rustc;
};
rustLibSrc = callPackage ./rust-lib-src.nix {
- inherit stdenv rustc;
+ inherit runCommand rustc;
};
# Hooks
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix
index 67a7fa3641..aa91433863 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix
@@ -1,11 +1,6 @@
-{ stdenv, rustc }:
+{ runCommand, rustc }:
-stdenv.mkDerivation {
- name = "rust-lib-src";
- src = rustc.src;
- phases = [ "unpackPhase" "installPhase" ];
-
- installPhase = ''
- mv library $out
- '';
-}
+runCommand "rust-lib-src" { } ''
+ tar --strip-components=1 -xzf ${rustc.src}
+ mv library $out
+''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
index 4239e92b03..69bdb37ac2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix
@@ -1,25 +1,21 @@
-{ lib, stdenv, rustc, minimalContent ? true }:
+{ lib, runCommand, rustc, minimalContent ? true }:
-stdenv.mkDerivation {
- name = "rust-src";
- src = rustc.src;
- phases = [ "unpackPhase" "installPhase" ];
- installPhase = ''
- mv src $out
- rm -rf $out/{${lib.concatStringsSep "," ([
- "ci"
- "doc"
- "etc"
- "grammar"
- "llvm-project"
- "llvm-emscripten"
- "rtstartup"
- "rustllvm"
- "test"
- "vendor"
- ] ++ lib.optionals minimalContent [
- "tools"
- "stdarch"
- ])}}
- '';
-}
+runCommand "rust-src" { } ''
+ tar -xzf ${rustc.src}
+ mv rustc-${rustc.version}-src $out
+ rm -rf $out/{${lib.concatStringsSep "," ([
+ "ci"
+ "doc"
+ "etc"
+ "grammar"
+ "llvm-project"
+ "llvm-emscripten"
+ "rtstartup"
+ "rustllvm"
+ "test"
+ "vendor"
+ ] ++ lib.optionals minimalContent [
+ "tools"
+ "stdarch"
+ ])}}
+''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty.nix
index c99ed24c21..1cd187f2e5 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/scala/dotty.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/scala/dotty.nix
@@ -7,7 +7,8 @@ let
in
stdenv.mkDerivation {
- name = "dotty-${dotty-bare.version}";
+ pname = "dotty";
+ inherit (dotty-bare) version;
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
index e3a9aa2b48..f47d4cd818 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
@@ -182,7 +182,8 @@ let
in
stdenv.mkDerivation {
- name = "swift-${versions.swift}";
+ pname = "swift";
+ version = versions.swift;
nativeBuildInputs = [
autoconf
diff --git a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
index 7381e7c89f..66f1bda6d5 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix
@@ -21,7 +21,8 @@ let
in
stdenv.mkDerivation {
- name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
+ pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}";
+ inherit version;
src = fetchFromGitLab {
owner = "urn";
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
index 032b2577c5..c8893a751f 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix
@@ -700,11 +700,6 @@ self: super: builtins.intersectAttrs super {
testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or [];
}) super.retrie_1_2_0_0;
- nix-output-monitor = overrideCabal {
- # Can't ran the golden-tests with nix, because they call nix
- testTarget = "unit-tests";
- } super.nix-output-monitor;
-
haskell-language-server = overrideCabal (drv: {
# starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
# by default. Unless we reflect this in the generic builder, GHC is going to
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
index c0ee8988c0..4a8b639071 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/chibi/default.nix
@@ -1,18 +1,8 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
-let
- version = "0.10";
- name = "chibi-scheme-${version}";
-in
-stdenv.mkDerivation {
- inherit name;
- meta = {
- homepage = "https://github.com/ashinn/chibi-scheme";
- description = "Small Footprint Scheme for use as a C Extension Language";
- platforms = lib.platforms.all;
- license = lib.licenses.bsd3;
- maintainers = [ lib.maintainers.DerGuteMoritz ];
- };
+stdenv.mkDerivation rec {
+ version = "0.10";
+ pname = "chibi-scheme";
src = fetchFromGitHub {
owner = "ashinn";
@@ -36,4 +26,12 @@ stdenv.mkDerivation {
--replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
done
'';
+
+ meta = {
+ homepage = "https://github.com/ashinn/chibi-scheme";
+ description = "Small Footprint Scheme for use as a C Extension Language";
+ platforms = lib.platforms.all;
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.DerGuteMoritz ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
index 646fd70ff8..5f08386c9f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -25,7 +25,7 @@ in
assert versionAtLeast (getVersion erlang) minimumOTPVersion;
stdenv.mkDerivation ({
- name = "${baseName}-${version}";
+ pname = "${baseName}";
inherit src version debugInfo;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix
index e56945ed65..b73cdaff5d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix
@@ -2,9 +2,10 @@
}:
racket.overrideAttrs (oldAttrs: rec {
- name = "racket-minimal-${oldAttrs.version}";
+ pname = "racket-minimal";
+ version = oldAttrs.version;
src = oldAttrs.src.override {
- inherit name;
+ name = "${pname}-${version}";
sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw=";
};
diff --git a/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix b/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix
index d0a13f6252..f223e20522 100644
--- a/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix
+++ b/third_party/nixpkgs/pkgs/development/java-modules/m2install.nix
@@ -2,15 +2,15 @@
{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
let
- name = "${artifactId}-${version}";
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
- m2File = "${name}${suffix}.${type}";
+ m2File = "${artifactId}-${version}${suffix}.${type}";
src = fetchurl {
inherit sha512;
url = "mirror://maven/${m2Path}/${m2File}";
};
in stdenv.mkDerivation {
- inherit name m2Path m2File src;
+ inherit version m2Path m2File src;
+ pname = artifactId;
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix
index a1d3c183b8..7380a85248 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.14.2";
- name = "cgal-" + version;
+ pname = "cgal";
src = fetchFromGitHub {
owner = "CGAL";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix
new file mode 100644
index 0000000000..1ff34a8d1f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/alglib/default.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, fetchurl, cmake, clang }:
+
+stdenv.mkDerivation rec {
+ pname = "alglib3";
+ version = "3.18.0";
+
+ src = fetchurl {
+ url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
+ sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ clang
+ ];
+
+ patches = [
+ ./patch-alglib-CMakeLists.patch
+ ];
+
+ meta = with lib; {
+ description = "Numerical analysis and data processing library";
+ homepage = "https://www.alglib.net/";
+ license = lib.licenses.gpl2Plus;
+ maintainers = [ maintainers.paperdigits ];
+ longDescription = ''
+ ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include:
+
+ * Data analysis (classification/regression, statistics)
+ * Optimization and nonlinear solvers
+ * Interpolation and linear/nonlinear least-squares fitting
+ * Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers
+ * Fast Fourier Transform and many other algorithms
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/third_party/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch
new file mode 100644
index 0000000000..b91a0c0aef
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch
@@ -0,0 +1,23 @@
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,20 @@
++cmake_minimum_required(VERSION 2.8)
++
++project(alglib3 CXX)
++
++file(GLOB_RECURSE sources src/*.cpp)
++file(GLOB_RECURSE headers src/*.h)
++
++add_library(${PROJECT_NAME} STATIC ${sources} ${headers})
++
++install(
++ TARGETS ${PROJECT_NAME}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++
++install(
++ FILES ${headers}
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib
++)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
index c39ea78a77..9b07697a6a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
@@ -14,27 +14,31 @@
, glib
, xapian
, libxml2
+, libxmlb
, libyaml
, gobject-introspection
, pcre
, itstool
, gperf
, vala
-, lmdb
, curl
+, nixosTests
}:
stdenv.mkDerivation rec {
pname = "appstream";
- version = "0.14.4";
+ version = "0.15.2";
+ # When bumping this package, please also check whether
+ # fix-build-for-qt-olderthan-514.patch still applies by
+ # building libsForQt512.appstream-qt.
- outputs = [ "out" "dev" ];
+ outputs = [ "out" "dev" "installedTests" ];
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
rev = "v${version}";
- sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg=";
+ sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q=";
};
patches = [
@@ -43,6 +47,9 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
libstemmer_includedir = "${lib.getDev libstemmer}/include";
})
+
+ # Allow installing installed tests to a separate output.
+ ./installed-tests-path.patch
];
nativeBuildInputs = [
@@ -65,9 +72,9 @@ stdenv.mkDerivation rec {
glib
xapian
libxml2
+ libxmlb
libyaml
gperf
- lmdb
curl
];
@@ -75,8 +82,15 @@ stdenv.mkDerivation rec {
"-Dapidocs=false"
"-Ddocs=false"
"-Dvapi=true"
+ "-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
+ passthru = {
+ tests = {
+ installed-tests = nixosTests.installed-tests.appstream;
+ };
+ };
+
meta = with lib; {
description = "Software metadata handling library";
homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
@@ -88,5 +102,5 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl21Plus;
platforms = platforms.unix;
- };
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch
new file mode 100644
index 0000000000..35db2bec91
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch
@@ -0,0 +1,43 @@
+diff --git a/qt/component.h b/qt/component.h
+index 47abd1f3..74de943c 100644
+--- a/qt/component.h
++++ b/qt/component.h
+@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component {
+ UrlKindContact,
+
+ // deprecated
+- UrlTranslate [[deprecated]] = UrlKindTranslate,
++ UrlTranslate = UrlKindTranslate,
+ };
+ Q_ENUM(UrlKind)
+
+diff --git a/qt/pool.h b/qt/pool.h
+index b59829b7..5237f613 100644
+--- a/qt/pool.h
++++ b/qt/pool.h
+@@ -70,9 +70,9 @@ public:
+ FlagMonitor = 1 << 7,
+
+ // deprecated
+- FlagReadCollection [[deprecated]] = FlagLoadOsCollection,
+- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo,
+- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles,
++ FlagReadCollection = FlagLoadOsCollection,
++ FlagReadMetainfo = FlagLoadOsMetainfo,
++ FlagReadDesktopFiles = FlagLoadOsDesktopFiles,
+ };
+
+ /**
+@@ -84,9 +84,9 @@ public:
+ * Flags on how caching should be used.
+ **/
+ enum CacheFlags {
+- CacheFlagNone [[deprecated]] = 0,
+- CacheFlagUseUser [[deprecated]] = 1 << 0,
+- CacheFlagUseSystem [[deprecated]] = 1 << 1,
++ CacheFlagNone = 0,
++ CacheFlagUseUser = 1 << 0,
++ CacheFlagUseSystem = 1 << 1,
+ };
+
+ /**
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
index 0da72a78cb..2f1249daef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
@@ -1,18 +1,21 @@
diff --git a/data/meson.build b/data/meson.build
-index 1eb3dfb0..623b66ec 100644
+index 53f31cb4..90f40e77 100644
--- a/data/meson.build
+++ b/data/meson.build
-@@ -26,4 +26,4 @@ i18n.merge_file (
+@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli',
)
- install_data ('appstream.conf',
-- install_dir: get_option('sysconfdir'))
-+ install_dir: get_option('prefix') / 'etc')
+ install_data('appstream.conf',
+- install_dir: get_option('sysconfdir'))
++ install_dir: get_option('prefix') / 'etc')
+
+ if get_option('compose')
+ ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml'
diff --git a/meson.build b/meson.build
-index dc1fb1a5..5ee03b73 100644
+index 2efe86b7..9dc79e28 100644
--- a/meson.build
+++ b/meson.build
-@@ -108,12 +108,12 @@ if get_option ('gir')
+@@ -107,12 +107,12 @@ if get_option ('gir')
dependency('gobject-introspection-1.0', version: '>=1.56')
endif
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch
new file mode 100644
index 0000000000..188c1e5258
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch
@@ -0,0 +1,27 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index 8dd8e0c7..e2a30b06 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -44,6 +44,11 @@ option('install-docs',
+ value : true,
+ description : 'Install documentation for API and specification'
+ )
++option('installed_test_prefix',
++ type : 'string',
++ value : '',
++ description : 'Prefix for installed tests'
++)
+
+ #
+ # For development
+diff --git a/tests/installed-tests/meson.build b/tests/installed-tests/meson.build
+index 405820ce..f592a753 100644
+--- a/tests/installed-tests/meson.build
++++ b/tests/installed-tests/meson.build
+@@ -10,5 +10,5 @@ configure_file(
+ output : 'metainfo-validate.test',
+ configuration : itconf,
+ install: true,
+- install_dir: join_paths('share', 'installed-tests', 'appstream'),
++ install_dir: join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'appstream'),
+ )
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
index 0bcb4741ff..3704332119 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
@@ -1,12 +1,12 @@
-{ mkDerivation, appstream, qtbase, qttools }:
+{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }:
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
mkDerivation {
pname = "appstream-qt";
- inherit (appstream) version src patches;
+ inherit (appstream) version src;
- outputs = [ "out" "dev" ];
+ outputs = [ "out" "dev" "installedTests" ];
buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
@@ -14,11 +14,26 @@ mkDerivation {
mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
+ patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [
+ # Fix darwin build for libsForQt5.appstream-qt
+ # Old Qt moc doesn't know about fancy C++14 features
+ # ../qt/component.h:93: Parse error at "UrlTranslate"
+ # Remove both this patch and related comment in default.nix
+ # once Qt 5.14 or later becomes default on darwin
+ ./fix-build-for-qt-olderthan-514.patch
+ ];
+
postFixup = ''
sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \
-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@"
'';
+ passthru = appstream.passthru // {
+ tests = {
+ installed-tests = nixosTests.installed-tests.appstream-qt;
+ };
+ };
+
meta = appstream.meta // {
description = "Software metadata handling library - Qt";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
index 22cac39dbe..2e8bdc50ca 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
strictDeps = true;
+ dontAddWafCrossFlags = true;
+ wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests";
meta = with lib; {
description = "Library for audio labelling";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix
index ad1f3483cf..b6fcb11c31 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
- version = "0.6.8";
+ version = "0.6.11";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
- sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw=";
+ sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix
index 87d66e1535..e7f0c0854d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-cal";
- version = "0.5.12";
+ version = "0.5.14";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc=";
+ sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
index 4af6d9b0ac..ab52fa5aa7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
- version = "0.6.18";
+ version = "0.6.19";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY=";
+ sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
index 2cfba1bd20..f19a69fc45 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
- version = "0.10.13";
+ version = "0.10.19";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY=";
+ sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix
index f75b744c3a..11ba67fe6f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
- version = "0.7.9";
+ version = "0.7.10";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
- sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc=";
+ sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix
index bd8ac2365a..2868e6b80b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
- version = "0.1.30";
+ version = "0.1.33";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
- sha256 = "sha256-vsKQJPYdaBveb9kpZitmXFTqEeWWA4h0BkqxRzdOu28=";
+ sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix
index 9f70be5eb8..391ecc26fb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
- version = "0.17.8";
+ version = "0.17.16";
outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
- sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo=";
+ sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix
index 44e534757c..bfa8aef2dd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix
@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "coeurl";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitLab {
domain = "nheko.im";
owner = "nheko-reborn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
+ sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0=";
};
nativeBuildInputs = [ ninja pkg-config meson ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
index 9f0585e0ef..dfc194f1d4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "folly";
- version = "2022.02.21.00";
+ version = "2022.02.28.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "sha256-QCL+GLc6b4Ae3jUj7VCxnE7Yc1JJ8+P0/r41Zf0KYos=";
+ sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
index 870e919357..8758daf9c3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -11,6 +11,7 @@
, gtest
, ninja
, nlohmann_json
+, openssl
, pkg-config
, protobuf
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
@@ -18,29 +19,29 @@
, staticOnly ? stdenv.hostPlatform.isStatic
}:
let
- googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435";
+ googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6";
googleapis = fetchFromGitHub {
owner = "googleapis";
repo = "googleapis";
rev = googleapisRev;
- hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl";
+ hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY=";
};
excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);
in
stdenv.mkDerivation rec {
pname = "google-cloud-cpp";
- version = "1.32.1";
+ version = "1.38.0";
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-cpp";
rev = "v${version}";
- sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9";
+ sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA=";
};
postPatch = ''
substituteInPlace external/googleapis/CMakeLists.txt \
- --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}"
+ --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}"
'';
nativeBuildInputs = [
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
] ++ lib.optionals (!doInstallCheck) [
- # enable these dependencies when doInstallCheck failse because we're
+ # enable these dependencies when doInstallCheck is false because we're
# unconditionally building tests and benchmarks
#
# when doInstallCheck is true, these deps are added to installCheckInputs
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
curl
grpc
nlohmann_json
+ openssl
protobuf
];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml
index c2fb2a2448..8cbe766862 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml
+++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml
@@ -1,6 +1,6 @@
whole = [
"bigquery_bigquery_read_integration_test",
- "bigtable_admin_backup_integration_test",
+ "bigtable_admin_admin_iam_policy_integration_test",
"bigtable_admin_iam_policy_integration_test",
"bigtable_admin_integration_test",
"bigtable_apply_read_latency_benchmark",
@@ -15,12 +15,15 @@ whole = [
"bigtable_table_sample_rows_integration_test",
"iam_iam_credentials_integration_test",
"iam_iam_integration_test",
+ "logging_quickstart",
"pubsub_endurance",
"pubsub_schema_admin_integration_test",
"pubsub_subscriber_integration_test",
"pubsub_subscription_admin_integration_test",
"pubsub_throughput",
"pubsub_topic_admin_integration_test",
+ "rest_internal_internal_curl_rest_client_integration_test",
+ "rest_internal_internal_unified_rest_credentials_integration_test",
"spanner_admin_backup_extra_integration_test",
"spanner_admin_database_admin_integration_test",
"spanner_admin_instance_admin_integration_test",
diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
index 8581ab729a..d9ac5e4da3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "22.0.2";
+ version = "22.0.3";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
- sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28";
+ sha256 = "sha256-cXolz4hKLSTs8K9tCxaKnC2Pr0lQ0M+pPeF2w6bOAR8=";
};
nativeBuildInputs = [ cmake ];
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = with maintainers; [ primeos SuperSandro2000 ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
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 08ce423549..6a9d523f90 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
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
license = with licenses; [ bsd3 mit ];
platforms = platforms.linux;
- maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ];
+ maintainers = with maintainers; [ jfrankenau SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix
index 3d28d6ef5a..a270051f48 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libaacs/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libaacs";
- version = "0.11.0";
+ version = "0.11.1";
src = fetchurl {
url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2";
- sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d";
+ sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk=";
};
buildInputs = [ libgcrypt libgpg-error ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix
index f61fb775fb..893704ddb1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.20.0";
+ version = "3.21.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc=";
+ sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix
index 96b8c7ac2e..d8093a58de 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libschrift/default.nix
@@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "libschrift";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "tomolt";
repo = pname;
- rev = "c207585486b3e78ec5506f55f5d56178f421a53c";
- sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1";
+ rev = "v" + version;
+ sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv";
};
- # fix a compilation failure related to darwin integers, remove at next release
- patches = [
- (fetchpatch {
- url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch";
- sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv";
- })
- ];
-
postPatch = ''
substituteInPlace config.mk \
--replace "PREFIX = /usr/local" "PREFIX = $out"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsciter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsciter/default.nix
new file mode 100644
index 0000000000..6f3016ce47
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libsciter/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, glib
+, cairo
+, libuuid
+, pango
+, gdk-pixbuf
+, gtk3
+, stdenv
+, fetchurl
+, autoPatchelfHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libsciter";
+ version = "4.4.8.23-bis"; # Version specified in GitHub commit title
+
+ src = fetchurl {
+ url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so";
+ sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [ glib cairo libuuid pango gtk3 ];
+
+ dontUnpack = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -m755 -D $src $out/lib/libsciter-gtk.so
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "https://sciter.com";
+ description = "Embeddable HTML/CSS/JavaScript engine for modern UI development";
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ leixb ];
+ license = licenses.unfree;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix
index d9446d8c85..b5dc8c1820 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libwbxml/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libwbxml";
- version = "0.11.7";
+ version = "0.11.8";
src = fetchFromGitHub {
owner = "libwbxml";
repo = "libwbxml";
rev = "${pname}-${version}";
- sha256 = "sha256:1b81rbkd28d9059vh8n5gql73crp8h7av67kkmr6lhicl08fv2xx";
+ sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index 85fda8ddc8..80d6129f18 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
+, fetchpatch
, docbook_xml_dtd_43
, docbook_xsl
, glib
@@ -30,6 +31,13 @@ stdenv.mkDerivation rec {
patches = [
./installed-tests-path.patch
+ # Fix darwin build, can be removed on next release
+ # `--version-script` isn't supported by the macOS linker
+ # https://github.com/hughsie/libxmlb/pull/119
+ (fetchpatch {
+ url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch";
+ sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw=";
+ })
];
nativeBuildInputs = [
@@ -72,6 +80,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hughsie/libxmlb";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix
new file mode 100644
index 0000000000..ac69ab8dac
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libyuv/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, stdenv
+, fetchgit
+, cmake
+, libjpeg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libyuv";
+ version = "1787"; # Defined in: include/libyuv/version.h
+
+ src = fetchgit {
+ url = "https://chromium.googlesource.com/libyuv/libyuv.git";
+ rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable
+ sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ # NEON does not work on aarch64, we disable it
+ cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"];
+
+ buildInputs = [ libjpeg ];
+
+ meta = with lib; {
+ homepage = "https://chromium.googlesource.com/libyuv/libyuv";
+ description = "Open source project that includes YUV scaling and conversion functionality";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ leixb ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
index 86edacc616..bd639ec304 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
@@ -10,6 +10,10 @@
, enableJemalloc ? false, jemalloc ? null
, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic
, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
+
+# downstream dependencies, for testing
+, curl
+, libsoup
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
#doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
+ passthru.tests = {
+ inherit curl libsoup;
+ };
+
meta = with lib; {
homepage = "https://nghttp2.org/";
description = "A C implementation of HTTP/2";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
index 80de299793..18809654c4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -32,7 +32,7 @@ let
};
};
in
- builtins.listToAttrs (map (a: { inherit (a) pname; value = mkDataset a; }) [
+ builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [
{
pname = "G4NDL";
version = "4.6";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix
index 4f738c33a0..8983f09f2d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix
@@ -39,6 +39,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y=";
};
+ patches = [
+ # backport a patch to fix hangs in some applications
+ # ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213
+ # FIXME: drop this in 0.4.9
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch";
+ sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU=";
+ })
+ ];
+
nativeBuildInputs = [
meson
pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix
index 113143311e..7711dde497 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix
@@ -72,5 +72,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.DamienCassou ];
platforms = platforms.all;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
index 395e5d0c75..c22ff6c373 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
- version = "1.3.4";
+ version = "1.3.6";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
- hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY=";
+ hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/shine/default.nix b/third_party/nixpkgs/pkgs/development/libraries/shine/default.nix
new file mode 100644
index 0000000000..8e5d02e632
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/shine/default.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ pname = "shine";
+ version = "3.1.1";
+
+ src = fetchFromGitHub {
+ owner = "toots";
+ repo = "shine";
+ rev = version;
+ sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ meta = with lib; {
+ description = "Fast fixed-point mp3 encoding library";
+ homepage = "https://github.com/toots/shine";
+ license = licenses.lgpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
index f21a947a53..2a9f0cf740 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
backends for each supported hardware vendor.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = with maintainers; [ primeos ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 92405b35de..afa8c63490 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -60,6 +60,7 @@
, addOpenGLRunpath
, enableGeoLocation ? true
, withLibsecret ? true
+, systemdSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
@@ -158,9 +159,10 @@ stdenv.mkDerivation rec {
bubblewrap
libseccomp
libmanette
- systemd
wayland
xdg-dbus-proxy
+ ] ++ lib.optionals systemdSupport [
+ systemd
] ++ lib.optionals enableGeoLocation [
geoclue2
] ++ lib.optionals withLibsecret [
@@ -193,7 +195,7 @@ stdenv.mkDerivation rec {
"-DUSE_APPLE_ICU=OFF"
"-DUSE_OPENGL_OR_ES=OFF"
"-DUSE_SYSTEM_MALLOC=ON"
- ] ++ lib.optionals (!stdenv.isLinux) [
+ ] ++ lib.optionals (!systemdSupport) [
"-DUSE_SYSTEMD=OFF"
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
"-DENABLE_GLES2=ON"
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index c4442f1fd7..71d85a776b 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
@@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
}:
buildLuarocksPackage {
pname = "luv";
- version = "1.42.0-0";
+ version = "1.43.0-0";
knownRockspec = (fetchurl {
- url = "https://luarocks.org/luv-1.42.0-0.rockspec";
- sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09";
+ url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec";
+ sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f";
}).outPath;
src = fetchurl {
- url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz";
- sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm";
+ url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz";
+ sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn";
};
disabled = with lua; (luaOlder "5.1");
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 e5fe5bf356..d6ac03eba3 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
@@ -237,6 +237,7 @@
, "postcss-cli"
, "prebuild-install"
, "prettier"
+, "prettier_d_slim"
, "prettier-plugin-toml"
, "prisma"
, "@prisma/language-server"
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 eff68036b2..b29d698ecb 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -103,15 +103,6 @@ let
sha512 = "r07oo8GgUGY28SR3PCM1qNfLE6PNx6SfzBlG4p0OrQQ68ln8HipsEysDGakOWjNFK18SCGWOXAUNrUj8GnV+5g==";
};
};
- "@angular-devkit/core-13.2.3" = {
- name = "_at_angular-devkit_slash_core";
- packageName = "@angular-devkit/core";
- version = "13.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.3.tgz";
- sha512 = "/47RA8qmWzeS60xSdaprIn1MiSv0Iw83t0M9/ENH7irFS5vMAq62NCcwiWXH59pZmvvLbF+7xy/RgYUZLr4nHQ==";
- };
- };
"@angular-devkit/core-13.2.4" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
@@ -130,15 +121,6 @@ let
sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A==";
};
};
- "@angular-devkit/schematics-13.2.3" = {
- name = "_at_angular-devkit_slash_schematics";
- packageName = "@angular-devkit/schematics";
- version = "13.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.3.tgz";
- sha512 = "+dyC4iKV0huvpjiuz4uyjLNK3FsCIp/Ghv5lXvhG6yok/dCAubsJItJOxi6G16aVCzG/E9zbsDfm9fNMyVOkgQ==";
- };
- };
"@angular-devkit/schematics-13.2.4" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
@@ -157,13 +139,13 @@ let
sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g==";
};
};
- "@angular-devkit/schematics-cli-13.2.3" = {
+ "@angular-devkit/schematics-cli-13.2.5" = {
name = "_at_angular-devkit_slash_schematics-cli";
packageName = "@angular-devkit/schematics-cli";
- version = "13.2.3";
+ version = "13.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.3.tgz";
- sha512 = "huCAno7u2K3Td3oiB41ax5AtoMyij6NmJsUxhpYQkZxnNsio9CKeSJnOuzml8SAILExc7sHFNW5A+9BeLluE4A==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.5.tgz";
+ sha512 = "/3Q1+wtE+l5XXoXX/7157yh4Wpi+FNEryx5gDcfPJchgtovxj28nzquD0vXnvpyr3Wd8OaMwg6vW4EfL82jRKg==";
};
};
"@antora/asciidoc-loader-3.0.1" = {
@@ -2344,13 +2326,13 @@ let
sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==";
};
};
- "@blueprintjs/colors-4.0.0-beta.3" = {
+ "@blueprintjs/colors-4.0.0-rc.0" = {
name = "_at_blueprintjs_slash_colors";
packageName = "@blueprintjs/colors";
- version = "4.0.0-beta.3";
+ version = "4.0.0-rc.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-beta.3.tgz";
- sha512 = "42i7qeyFZT/qJFj8iagVECB91HmqxiCY7rw+EaOHSKCwbasbJF0BmAMViZCrOhvw++ZQ2WXmu+CxH6jkvSeDtg==";
+ url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-rc.0.tgz";
+ sha512 = "+Iw5LUa9MtbEGtm09eAtGyalVS7n8wM1/nUmFl0CCq176wqRzS0/VyCo0qdweZqzypEtHnXaFNmr+Cgt4Ge1kQ==";
};
};
"@blueprintjs/core-3.53.0" = {
@@ -2452,13 +2434,13 @@ let
sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ==";
};
};
- "@chemzqm/neovim-5.7.4" = {
+ "@chemzqm/neovim-5.7.5" = {
name = "_at_chemzqm_slash_neovim";
packageName = "@chemzqm/neovim";
- version = "5.7.4";
+ version = "5.7.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.4.tgz";
- sha512 = "ajh2G+EhzqAHkAMsXsiNUG2cpGROO3RiAJbFQ0Px1cf9zE2YqWVZ8h7dFd7aj/zit+la9uTA1OPQkn4FZrHrjw==";
+ url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.5.tgz";
+ sha512 = "BlwPjCDjeSdwIk7vP3wU6kFI+ZJBji8j5QWy631r+aQM1t74AclUOWNQZT8/GX3y2hqmC9LZnFT/bTQtVxw24g==";
};
};
"@cnakazawa/watch-1.0.4" = {
@@ -2767,13 +2749,13 @@ let
sha512 = "WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w==";
};
};
- "@cspell/dict-elixir-2.0.0" = {
+ "@cspell/dict-elixir-2.0.1" = {
name = "_at_cspell_slash_dict-elixir";
packageName = "@cspell/dict-elixir";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.0.tgz";
- sha512 = "NeDObcqiYuqWRrzMAQLZDSrZlChTEZwTA2zHdI2nPtpeDl4FQcTz2BHP8zVt6Lj6G2QHJmNGmQtSmDguX86NYA==";
+ url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz";
+ sha512 = "eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow==";
};
};
"@cspell/dict-en-gb-1.1.33" = {
@@ -2956,13 +2938,13 @@ let
sha512 = "Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ==";
};
};
- "@cspell/dict-ruby-2.0.0" = {
+ "@cspell/dict-ruby-2.0.1" = {
name = "_at_cspell_slash_dict-ruby";
packageName = "@cspell/dict-ruby";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.0.tgz";
- sha512 = "ux73GEIZrApxIG/BDnpdxWE7r9TY3n+3HFAEp+LDJjSjpwpn2VXopd7GsjwsvmlAv5F3Jch8tzgzujFZkvqdoA==";
+ url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz";
+ sha512 = "qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ==";
};
};
"@cspell/dict-rust-2.0.0" = {
@@ -2983,13 +2965,13 @@ let
sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==";
};
};
- "@cspell/dict-software-terms-2.1.1" = {
+ "@cspell/dict-software-terms-2.1.2" = {
name = "_at_cspell_slash_dict-software-terms";
packageName = "@cspell/dict-software-terms";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.1.tgz";
- sha512 = "PmmqysKSvNwksjEfXrzD1wEVvctR6qppxDhwNc4IQQjwpjmtN8e+8HiXxIbCsBcll1rO0vOmnhpXUdl+d9apXQ==";
+ url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.2.tgz";
+ sha512 = "iTkkduYX4+NVHt1CKbDGDQJsSTqMCafGZKhtasPQTUN6UxIaDFM9Hxl1wAoECDaRRDgkaGP0v1C7F8jY7nFyKQ==";
};
};
"@cspell/dict-swift-1.0.2" = {
@@ -3946,13 +3928,13 @@ let
sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw==";
};
};
- "@graphql-tools/url-loader-7.7.2" = {
+ "@graphql-tools/url-loader-7.8.0" = {
name = "_at_graphql-tools_slash_url-loader";
packageName = "@graphql-tools/url-loader";
- version = "7.7.2";
+ version = "7.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.2.tgz";
- sha512 = "7qDLs7zvFg3shr6UDvArYTlhezjsulIGt7bUIve3nZZDgs/x8EAKeod4/+pt1ZUYq19aSMt19N1Een0F+xWWsA==";
+ url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.8.0.tgz";
+ sha512 = "4j5X40hpYInM5J7KbURSspEJCi6tPqvEE2kyBOyP0C0YIOYtKgUJTAryjbBXqr+HWGyEwJ2zuQ2cQdVMn8l78A==";
};
};
"@graphql-tools/utils-6.2.4" = {
@@ -4000,13 +3982,13 @@ let
sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg==";
};
};
- "@graphql-tools/wrap-8.4.2" = {
+ "@graphql-tools/wrap-8.4.3" = {
name = "_at_graphql-tools_slash_wrap";
packageName = "@graphql-tools/wrap";
- version = "8.4.2";
+ version = "8.4.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.2.tgz";
- sha512 = "U6vpfOhp+uyTNsDi1wbk0dpCn6oJ3CmRS2EUpyuzHQDC7YQgAElxn5Wl/eDsKmhJGzGDODKY9M6yHAEH/tRrPQ==";
+ url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.3.tgz";
+ sha512 = "2bd3GtlqV72idEphLTM8SRiSxEDrMPGE556faW8N5Q2qK7qlCEu9AQK0HNKWKdtEPTHqahndZtIPcdpNN6xGig==";
};
};
"@grpc/grpc-js-1.4.4" = {
@@ -5872,13 +5854,13 @@ let
sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==";
};
};
- "@npmcli/run-script-3.0.0" = {
+ "@npmcli/run-script-3.0.1" = {
name = "_at_npmcli_slash_run-script";
packageName = "@npmcli/run-script";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.0.tgz";
- sha512 = "jIdmUepw+kVP2WEE/+XrBIvrSF5miDutdGBrQ8May6uHVAvpAb0m3NRHcJ0lKWbQ1BxsRFsmTrjkdY99qTTVIw==";
+ url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz";
+ sha512 = "o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg==";
};
};
"@oclif/command-1.8.0" = {
@@ -6106,13 +6088,13 @@ let
sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ==";
};
};
- "@octokit/plugin-throttling-3.5.2" = {
+ "@octokit/plugin-throttling-3.6.1" = {
name = "_at_octokit_slash_plugin-throttling";
packageName = "@octokit/plugin-throttling";
- version = "3.5.2";
+ version = "3.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz";
- sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A==";
+ url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.6.1.tgz";
+ sha512 = "T5DOcDQP0K/Ng5pnOEqCHDFojsftYL5o91MNbbR3nj1yAOACoGj3wDYCx0+5yJkbvRjYUdU0GsUt5/wYBba1cA==";
};
};
"@octokit/request-5.6.3" = {
@@ -7195,13 +7177,13 @@ let
sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA==";
};
};
- "@putdotio/api-client-8.29.0" = {
+ "@putdotio/api-client-8.30.0" = {
name = "_at_putdotio_slash_api-client";
packageName = "@putdotio/api-client";
- version = "8.29.0";
+ version = "8.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.29.0.tgz";
- sha512 = "zx1WB5OBDy7Qox4lWQdEvubQd5lMCfuJdR+unx7vnPN1bv3DYMV00+KsAeZpN+O4DVCIReTl8q3D55w6AKsYzw==";
+ url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.30.0.tgz";
+ sha512 = "J0OzprAIheo1/62NlhPkPVEyrLSewPaCQHZlidrkY1Ip60OtIwy/RojORR3Xm28I68wTUDMm3X1Ciz45aAUYww==";
};
};
"@reach/router-1.3.4" = {
@@ -9517,13 +9499,13 @@ let
sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==";
};
};
- "@types/vscode-1.64.0" = {
+ "@types/vscode-1.65.0" = {
name = "_at_types_slash_vscode";
packageName = "@types/vscode";
- version = "1.64.0";
+ version = "1.65.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz";
- sha512 = "bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA==";
+ url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz";
+ sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==";
};
};
"@types/webpack-4.41.32" = {
@@ -9616,13 +9598,13 @@ let
sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==";
};
};
- "@types/yargs-parser-20.2.1" = {
+ "@types/yargs-parser-21.0.0" = {
name = "_at_types_slash_yargs-parser";
packageName = "@types/yargs-parser";
- version = "20.2.1";
+ version = "21.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz";
- sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==";
+ url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz";
+ sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==";
};
};
"@types/yauzl-2.9.2" = {
@@ -9841,6 +9823,15 @@ let
sha512 = "98PTOukChScYXekWbDxPQEUCoX66W4188yx4Q4qiLTJgYRHsvQ5oWtNL5N0sz80mmYCk6aJglwnPE1d7tvgAmQ==";
};
};
+ "@vscode/emmet-helper-2.8.4" = {
+ name = "_at_vscode_slash_emmet-helper";
+ packageName = "@vscode/emmet-helper";
+ version = "2.8.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz";
+ sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==";
+ };
+ };
"@vue/cli-shared-utils-5.0.1" = {
name = "_at_vue_slash_cli-shared-utils";
packageName = "@vue/cli-shared-utils";
@@ -13567,22 +13558,22 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.1084.0" = {
+ "aws-sdk-2.1085.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1084.0";
+ version = "2.1085.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1084.0.tgz";
- sha512 = "fhMjPRrrln8LhMZw17IyrzkVXCG6okFMrZzgIZN1h63WWGot65qcIvYfUn7YyHpYWMLBeND8MRfW6x6PIqJBdA==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1085.0.tgz";
+ sha512 = "zL20v5QXoSsb2S6RKAhDmfnZYUIRldR93ihJ6mCYrw6Zl+Dir2SVmALy++U/zduDbKB4NaU72mscumx2RWc7Hg==";
};
};
- "aws-sdk-2.920.0" = {
+ "aws-sdk-2.1087.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.920.0";
+ version = "2.1087.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz";
- sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
+ sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
};
};
"aws-sign2-0.6.0" = {
@@ -15169,13 +15160,13 @@ let
sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
};
};
- "bittorrent-tracker-9.18.3" = {
+ "bittorrent-tracker-9.18.4" = {
name = "bittorrent-tracker";
packageName = "bittorrent-tracker";
- version = "9.18.3";
+ version = "9.18.4";
src = fetchurl {
- url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.3.tgz";
- sha512 = "IhLKp8wUgA7WXTfJggw/HB8qxhwlLNDWRraUFxXRHTgOQXcMiKITGcErzvC7B7mMOcUnk0wiUsZdaaQ8lzz3LQ==";
+ url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.4.tgz";
+ sha512 = "QpGYWMUab4CykgyJX/XcLdfQRp/Dg4qtGZqQTQlDtIXYHj9wnsO6dCH1jHWdGTyFfeofnuEjahUpaxquPZlyBQ==";
};
};
"bitwise-xor-0.0.0" = {
@@ -16123,13 +16114,13 @@ let
sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
};
};
- "browserslist-4.19.3" = {
+ "browserslist-4.20.0" = {
name = "browserslist";
packageName = "browserslist";
- version = "4.19.3";
+ version = "4.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz";
- sha512 = "XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==";
+ url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz";
+ sha512 = "bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==";
};
};
"brq-0.1.8" = {
@@ -17006,13 +16997,13 @@ let
sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b";
};
};
- "caller-0.0.1" = {
+ "caller-1.0.1" = {
name = "caller";
packageName = "caller";
- version = "0.0.1";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz";
- sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767";
+ url = "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz";
+ sha1 = "b851860f70e195db3d277395aa1a7e23ea30ecf5";
};
};
"caller-callsite-2.0.0" = {
@@ -17258,13 +17249,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001312" = {
+ "caniuse-lite-1.0.30001313" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001312";
+ version = "1.0.30001313";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz";
- sha512 = "Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz";
+ sha512 = "rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q==";
};
};
"canvas-2.9.0" = {
@@ -17420,22 +17411,22 @@ let
sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
};
};
- "cdk8s-1.5.30" = {
+ "cdk8s-1.5.35" = {
name = "cdk8s";
packageName = "cdk8s";
- version = "1.5.30";
+ version = "1.5.35";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.30.tgz";
- sha512 = "r/ak37mCxHzpKiOkiHe9Jqolk2aRGqB7pBNDGu/xAE608iuBRy6BGP6NG/KppOnJI8m2NLSbJQvJYjuWE7yDEQ==";
+ url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.35.tgz";
+ sha512 = "khKlC9OrNsNHHbBkuKulns4FzbNvuQVILHPJFx0gUg/Rq3SGpn4xwKqYmh4AhE//Y9RY6EhzQO9pHL9fpkPt0Q==";
};
};
- "cdk8s-plus-22-1.0.0-beta.131" = {
+ "cdk8s-plus-22-1.0.0-beta.137" = {
name = "cdk8s-plus-22";
packageName = "cdk8s-plus-22";
- version = "1.0.0-beta.131";
+ version = "1.0.0-beta.137";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.131.tgz";
- sha512 = "HQWeXSsxXoeMb7YYyWx5vuxKa6GWfB1XeRJtArP9zDVeE2wgFypKwngPZMCC9m2bze31mWWPnSI2QLWBNAxR/Q==";
+ url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.137.tgz";
+ sha512 = "RR3j4FMeGsolMScsneW0wNaXrpiwQ4v3ObDi7FeljfPwqTY1RL+Aip9rbzVqNp9qzEwOZMUja8dFF+DxjhXaOg==";
};
};
"cdktf-0.9.4" = {
@@ -20084,22 +20075,22 @@ let
sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
};
};
- "constructs-10.0.76" = {
+ "constructs-10.0.81" = {
name = "constructs";
packageName = "constructs";
- version = "10.0.76";
+ version = "10.0.81";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-10.0.76.tgz";
- sha512 = "588WcQJS/g1pFUHH/bhSbpo6US0rgn+FTWL3PKRw0PNDTKNOZjXRrsaXIBsvVmE60Iy6kkwL9FuovSjK/qNE/Q==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-10.0.81.tgz";
+ sha512 = "5+3bCzKPfcxo8ZQ3GOaiOpDmIux8PZXgkXqNwEopjTRCypcMWMt1AT8ORHPVht3Iqsj36/qG3wV72WaiCKe3mQ==";
};
};
- "constructs-3.3.231" = {
+ "constructs-3.3.236" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.231";
+ version = "3.3.236";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.231.tgz";
- sha512 = "NCntsRwmx0DWyFTMmGmB/7V90oqEBwH/7r/qcZ0vX2a1twI3U/rcNpqsKy9N3KDZ4XqI6+XyUgTv2o4nK1uYTw==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.236.tgz";
+ sha512 = "tYYAn8XtPOMa24KEBtIYeHwi5OxVQGKu19Ie9NhojOLlQsCgP+6knjEVfuZ0Hgn1T8nMRqMriwAgM19GiwCjDg==";
};
};
"consume-http-header-1.0.0" = {
@@ -20868,13 +20859,13 @@ let
sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA==";
};
};
- "cpy-9.0.0" = {
+ "cpy-9.0.1" = {
name = "cpy";
packageName = "cpy";
- version = "9.0.0";
+ version = "9.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cpy/-/cpy-9.0.0.tgz";
- sha512 = "+yJuWIPnwcdBx+vBcZkb1jeAu05TZlPTAXdZf/fMrksyPQf2tTQr3/zpm1CeBJxeS3E9t4X0HQnr+CMsKSDIXA==";
+ url = "https://registry.npmjs.org/cpy/-/cpy-9.0.1.tgz";
+ sha512 = "D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg==";
};
};
"crc-0.2.0" = {
@@ -21696,13 +21687,13 @@ let
sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
};
};
- "csstype-3.0.10" = {
+ "csstype-3.0.11" = {
name = "csstype";
packageName = "csstype";
- version = "3.0.10";
+ version = "3.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz";
- sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==";
+ url = "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz";
+ sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==";
};
};
"csurf-1.11.0" = {
@@ -22947,13 +22938,13 @@ let
sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==";
};
};
- "date-format-4.0.3" = {
+ "date-format-4.0.4" = {
name = "date-format";
packageName = "date-format";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz";
- sha512 = "7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==";
+ url = "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz";
+ sha512 = "/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==";
};
};
"date-now-0.1.4" = {
@@ -23433,15 +23424,6 @@ let
sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==";
};
};
- "deep-equal-0.1.2" = {
- name = "deep-equal";
- packageName = "deep-equal";
- version = "0.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
- sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
- };
- };
"deep-equal-0.2.2" = {
name = "deep-equal";
packageName = "deep-equal";
@@ -23820,15 +23802,6 @@ let
sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==";
};
};
- "delay-4.4.1" = {
- name = "delay";
- packageName = "delay";
- version = "4.4.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz";
- sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ==";
- };
- };
"delay-5.0.0" = {
name = "delay";
packageName = "delay";
@@ -24171,6 +24144,15 @@ let
sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg==";
};
};
+ "devtools-protocol-0.0.969999" = {
+ name = "devtools-protocol";
+ packageName = "devtools-protocol";
+ version = "0.0.969999";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz";
+ sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==";
+ };
+ };
"dezalgo-1.0.3" = {
name = "dezalgo";
packageName = "dezalgo";
@@ -25404,13 +25386,13 @@ let
sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==";
};
};
- "electron-to-chromium-1.4.75" = {
+ "electron-to-chromium-1.4.76" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.4.75";
+ version = "1.4.76";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz";
- sha512 = "LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz";
+ sha512 = "3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -25865,13 +25847,13 @@ let
sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==";
};
};
- "enhanced-resolve-5.9.1" = {
+ "enhanced-resolve-5.9.2" = {
name = "enhanced-resolve";
packageName = "enhanced-resolve";
- version = "5.9.1";
+ version = "5.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.1.tgz";
- sha512 = "jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==";
+ url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz";
+ sha512 = "GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==";
};
};
"enquirer-2.3.6" = {
@@ -29123,13 +29105,13 @@ let
sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
};
};
- "flow-parser-0.172.0" = {
+ "flow-parser-0.173.0" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.172.0";
+ version = "0.173.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.172.0.tgz";
- sha512 = "WWqgvuJgD9Y1n2su9D73m0g5kQ4XVl8Dwk6DeW5V6bjt4XMtVLzSHg35s3iiZOvShY+7w7l8FzlK81PGXRcIYQ==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.173.0.tgz";
+ sha512 = "gikomjo+jzdehhOCHP2Ca5y1HGK3jkODhUdTxk4a3SdyLAMBsEwb7KJETHzB4KQs7HhHcqhyT7mGmd9iT8B5Hg==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -29402,13 +29384,13 @@ let
sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==";
};
};
- "fork-ts-checker-webpack-plugin-6.5.0" = {
+ "fork-ts-checker-webpack-plugin-7.2.1" = {
name = "fork-ts-checker-webpack-plugin";
packageName = "fork-ts-checker-webpack-plugin";
- version = "6.5.0";
+ version = "7.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz";
- sha512 = "cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==";
+ url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.1.tgz";
+ sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw==";
};
};
"form-data-1.0.0-rc3" = {
@@ -29573,13 +29555,13 @@ let
sha512 = "WQT6rP6Jt3TxMdQB3IKzvfZKLuldumntgumLhIUhvPrukTHdWNI4JgEHY04Bd0LIOR9IQRpB+7RuxgUU0Vhmcg==";
};
};
- "fraction.js-4.1.3" = {
+ "fraction.js-4.2.0" = {
name = "fraction.js";
packageName = "fraction.js";
- version = "4.1.3";
+ version = "4.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz";
- sha512 = "pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==";
+ url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz";
+ sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==";
};
};
"fragment-cache-0.2.1" = {
@@ -33372,13 +33354,13 @@ let
sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137";
};
};
- "http-parser-js-0.5.5" = {
+ "http-parser-js-0.5.6" = {
name = "http-parser-js";
packageName = "http-parser-js";
- version = "0.5.5";
+ version = "0.5.6";
src = fetchurl {
- url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz";
- sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==";
+ url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz";
+ sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==";
};
};
"http-proxy-1.18.1" = {
@@ -37197,15 +37179,6 @@ let
sha1 = "a3abe2718af241a2b2904f84a625970f389ae32a";
};
};
- "jmespath-0.15.0" = {
- name = "jmespath";
- packageName = "jmespath";
- version = "0.15.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz";
- sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
- };
- };
"jmespath-0.16.0" = {
name = "jmespath";
packageName = "jmespath";
@@ -37702,13 +37675,13 @@ let
sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA==";
};
};
- "jsii-srcmak-0.1.490" = {
+ "jsii-srcmak-0.1.495" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.490";
+ version = "0.1.495";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.490.tgz";
- sha512 = "29Evf978EDQOMawRlDPMGqLBNGUrT9MSTUYnsG3xhjWj9Kqt/aRjy7V8tpaPkDFMQHgZ2bUYBrOpxkVFME/BgQ==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.495.tgz";
+ sha512 = "zAfFT/y52spvqFZJ5UDB29eAiyXvLce1ouTY/7GtJbRzlNxfwDOpmwZfNtnR6KQTfeW9DWtl6zJQQscIzdn38g==";
};
};
"json-bigint-1.0.0" = {
@@ -38008,13 +37981,13 @@ let
sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
};
};
- "json2jsii-0.2.150" = {
+ "json2jsii-0.2.155" = {
name = "json2jsii";
packageName = "json2jsii";
- version = "0.2.150";
+ version = "0.2.155";
src = fetchurl {
- url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.150.tgz";
- sha512 = "8vyDj+rUeL2vuSWGc6PBe/DcN60xf7HQD5muJ7NFtPDrVGh7V1MwKvyJyvfpgcieZ9kPVs7w5obvU5wPDBe9CA==";
+ url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.155.tgz";
+ sha512 = "uAcZRDPOQSD7LrITobxxaxwld34carsGTKY6u6fAH2arw13X0Pq5QlrgQBaVvFt/Uwh+L0g3TGAkumPMaYMm8A==";
};
};
"json3-3.2.6" = {
@@ -39394,13 +39367,13 @@ let
sha1 = "22c59bcaefaa9a8ef359cf759784e4bf106aea1b";
};
};
- "libnested-1.5.1" = {
+ "libnested-1.5.2" = {
name = "libnested";
packageName = "libnested";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/libnested/-/libnested-1.5.1.tgz";
- sha512 = "mA68lhvC5NypD/21rBNziTmqWaukivdbbDkWnXrry8iCV0/PuD8GSxa8W+ZtJwAOzvu/AdOx/YEb9NbqPq6s5Q==";
+ url = "https://registry.npmjs.org/libnested/-/libnested-1.5.2.tgz";
+ sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA==";
};
};
"libnpmaccess-4.0.3" = {
@@ -39547,6 +39520,15 @@ let
sha512 = "j3m+M50fY9bZ+OSRKzJLon7dkxL+guAOp8ppDd3CLlvrba5ldbs8QbkXuYMXlwLi3Aw4ztSyEUyh69aaSfEXyg==";
};
};
+ "lightning-5.8.2" = {
+ name = "lightning";
+ packageName = "lightning";
+ version = "5.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz";
+ sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ==";
+ };
+ };
"lilconfig-2.0.4" = {
name = "lilconfig";
packageName = "lilconfig";
@@ -39727,13 +39709,13 @@ let
sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ==";
};
};
- "lmdb-2.2.3" = {
+ "lmdb-2.2.4" = {
name = "lmdb";
packageName = "lmdb";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.3.tgz";
- sha512 = "+OiHQpw22mBBxocb/9vcVNETqf0k5vgHA2r+KX7eCf8j5tSV50ZIv388iY1mnnrERIUhs2sjKQbZhPg7z4HyPQ==";
+ url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz";
+ sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ==";
};
};
"ln-accounting-5.0.5" = {
@@ -39790,6 +39772,15 @@ let
sha512 = "ISbIBxbRIBKDPDFuWj3pINZXFRAmHTTeEWdeq7pXJxeFH8JlnrwS8ETSJ1AfgHeeUIHK1D4xo3TNAnkSrRpH/A==";
};
};
+ "ln-service-53.9.3" = {
+ name = "ln-service";
+ packageName = "ln-service";
+ version = "53.9.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz";
+ sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw==";
+ };
+ };
"ln-sync-3.10.1" = {
name = "ln-sync";
packageName = "ln-sync";
@@ -39799,6 +39790,15 @@ let
sha512 = "mib9y2c36Gz6oQ7sUzAmLV3a8wt52Rm1zKo7ldxBN49Tnh0gGQXbM69jOhLsy7DbB2TCjUJEh1d8OGMsbGuBqg==";
};
};
+ "ln-sync-3.11.0" = {
+ name = "ln-sync";
+ packageName = "ln-sync";
+ version = "3.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.11.0.tgz";
+ sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA==";
+ };
+ };
"ln-telegram-3.19.1" = {
name = "ln-telegram";
packageName = "ln-telegram";
@@ -41329,13 +41329,13 @@ let
sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==";
};
};
- "log4js-6.4.1" = {
+ "log4js-6.4.2" = {
name = "log4js";
packageName = "log4js";
- version = "6.4.1";
+ version = "6.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz";
- sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==";
+ url = "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz";
+ sha512 = "k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg==";
};
};
"logform-2.4.0" = {
@@ -41689,13 +41689,13 @@ let
sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
};
};
- "lru-cache-7.4.0" = {
+ "lru-cache-7.4.1" = {
name = "lru-cache";
packageName = "lru-cache";
- version = "7.4.0";
+ version = "7.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.0.tgz";
- sha512 = "YOfuyWa/Ee+PXbDm40j9WXyJrzQUynVbgn4Km643UYcWNcrSfRkKL0WaiUcxcIbkXcVTgNpDqSnPXntWXT75cw==";
+ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.1.tgz";
+ sha512 = "NCD7/WRlFmADccuHjsRUYqdluYBr//n/O0fesCb/n52FoGcgKh8o4Dpm7YIbZwVcDs8rPBQbCZLmWWsp6m+xGQ==";
};
};
"lru-queue-0.1.0" = {
@@ -41861,6 +41861,15 @@ let
sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==";
};
};
+ "magic-string-0.25.9" = {
+ name = "magic-string";
+ packageName = "magic-string";
+ version = "0.25.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz";
+ sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==";
+ };
+ };
"magicli-0.0.5" = {
name = "magicli";
packageName = "magicli";
@@ -41951,13 +41960,13 @@ let
sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
};
};
- "make-fetch-happen-10.0.3" = {
+ "make-fetch-happen-10.0.4" = {
name = "make-fetch-happen";
packageName = "make-fetch-happen";
- version = "10.0.3";
+ version = "10.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.3.tgz";
- sha512 = "CzarPHynPpHjhF5in/YapnO44rSZeYX5VCMfdXa99+gLwpbfFLh20CWa6dP/taV9Net9PWJwXNKtp/4ZTCQnag==";
+ url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.4.tgz";
+ sha512 = "CiReW6usy3UXby5N46XjWfLPFPq1glugCszh18I0NYJCwr129ZAx9j3Dlv+cRsK0q3VjlVysEzhdtdw2+NhdYA==";
};
};
"make-fetch-happen-8.0.14" = {
@@ -44336,6 +44345,15 @@ let
sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==";
};
};
+ "minipass-fetch-2.0.2" = {
+ name = "minipass-fetch";
+ packageName = "minipass-fetch";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.2.tgz";
+ sha512 = "M63u5yWX0yxY1C3DcLVY1xWai0pNM3qa1xCMXFgdejY5F/NTmyzNVHGcBxKerX51lssqxwWWTjpg/ZPuD39gOQ==";
+ };
+ };
"minipass-flush-1.0.5" = {
name = "minipass-flush";
packageName = "minipass-flush";
@@ -44984,13 +45002,13 @@ let
sha1 = "6462f1b204109ccc644601650110a828443d66e2";
};
};
- "multiblob-1.13.7" = {
+ "multiblob-1.13.8" = {
name = "multiblob";
packageName = "multiblob";
- version = "1.13.7";
+ version = "1.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.7.tgz";
- sha512 = "+vZLrxhuAJFOl9EFUkFviYpz8nIOdoM3Hzq8Mzx0uJkaRWd61QxIp68wglTM8ZtABXYgE0YowD98XqthCRxSow==";
+ url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.8.tgz";
+ sha512 = "YXNUflHc7I7iUiLctHMTvwDQOjMbCv+Pdbf+1lScFOsjP/CSZgwblRknPntcD+KEPGFudXPBtJR10TIrun3zmQ==";
};
};
"multiblob-http-1.2.1" = {
@@ -46353,13 +46371,13 @@ let
sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==";
};
};
- "node-fetch-3.2.1" = {
+ "node-fetch-3.2.2" = {
name = "node-fetch";
packageName = "node-fetch";
- version = "3.2.1";
+ version = "3.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.1.tgz";
- sha512 = "Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==";
+ url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.2.tgz";
+ sha512 = "Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w==";
};
};
"node-fetch-h2-2.3.0" = {
@@ -46452,6 +46470,15 @@ let
sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==";
};
};
+ "node-gyp-9.0.0" = {
+ name = "node-gyp";
+ packageName = "node-gyp";
+ version = "9.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz";
+ sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==";
+ };
+ };
"node-gyp-build-4.1.1" = {
name = "node-gyp-build";
packageName = "node-gyp-build";
@@ -47280,13 +47307,13 @@ let
sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==";
};
};
- "npm-registry-fetch-13.0.0" = {
+ "npm-registry-fetch-13.0.1" = {
name = "npm-registry-fetch";
packageName = "npm-registry-fetch";
- version = "13.0.0";
+ version = "13.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.0.tgz";
- sha512 = "MmiMuV9DU5gRuAU0jia952Qq+E4h7ZoUaeltCXivhClcqfOVKqNLZEQsRUOb6a8WQY+um8x97JcUuaWFoPoBBw==";
+ url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.1.tgz";
+ sha512 = "Ak+LXVtSrCLOdscFW/apUw67OPNph8waHsPKM9UOJosL7i59EF5XoSWQMEsXEOeifM9Bb4/2+WrQC4t/pd8DGg==";
};
};
"npm-registry-fetch-9.0.0" = {
@@ -51395,13 +51422,13 @@ let
sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==";
};
};
- "postcss-8.4.7" = {
+ "postcss-8.4.8" = {
name = "postcss";
packageName = "postcss";
- version = "8.4.7";
+ version = "8.4.8";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz";
- sha512 = "L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz";
+ sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==";
};
};
"postcss-calc-7.0.5" = {
@@ -54428,6 +54455,15 @@ let
sha512 = "2arcYPEGvLV9HvOw01Zv1b1IAXrMWHqsFJn0Hn00qe9HtCmaF0b8FlrbdLjCIbkaFc6icH5+GqcG8R5KxlJSRg==";
};
};
+ "puppeteer-13.5.0" = {
+ name = "puppeteer";
+ packageName = "puppeteer";
+ version = "13.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.0.tgz";
+ sha512 = "raPr2YZ3RZLboGwt7jJgusJTBRDaVEUiPOSOWWFLV1oj07xqT5UqqbjmNXFXlMlkhF/NwmcEInW64VhvyllVdw==";
+ };
+ };
"purest-3.1.0" = {
name = "purest";
packageName = "purest";
@@ -54482,13 +54518,13 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
- "pyright-1.1.226" = {
+ "pyright-1.1.227" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.226";
+ version = "1.1.227";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.226.tgz";
- sha512 = "ZJx3Kz5v7hc6DIeIVSC3zeCia43rlLD+IK8ip5k+h3gTlIQodaf/zccsCh2xmoBvCTY9VbbbLnDbkITyIW3+MA==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.227.tgz";
+ sha512 = "/nRQqbTpHraNiUZ0tpQfWYyqOV4nByx/rRHZp+wFjRv6v3Vfg1rIa973y9LsfH/vGkETbZMvRanb8VSlWp9Tlg==";
};
};
"q-0.9.7" = {
@@ -57488,13 +57524,13 @@ let
sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
};
};
- "requestretry-4.1.2" = {
+ "requestretry-7.0.2" = {
name = "requestretry";
packageName = "requestretry";
- version = "4.1.2";
+ version = "7.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz";
- sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA==";
+ url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz";
+ sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w==";
};
};
"require-directory-2.1.1" = {
@@ -58892,15 +58928,6 @@ let
sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
};
};
- "schema-utils-2.7.0" = {
- name = "schema-utils";
- packageName = "schema-utils";
- version = "2.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz";
- sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==";
- };
- };
"schema-utils-2.7.1" = {
name = "schema-utils";
packageName = "schema-utils";
@@ -58973,15 +59000,6 @@ let
sha512 = "NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==";
};
};
- "secret-handshake-1.1.20" = {
- name = "secret-handshake";
- packageName = "secret-handshake";
- version = "1.1.20";
- src = fetchurl {
- url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.20.tgz";
- sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA==";
- };
- };
"secret-handshake-1.1.21" = {
name = "secret-handshake";
packageName = "secret-handshake";
@@ -59945,13 +59963,13 @@ let
sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA==";
};
};
- "shush-1.0.0" = {
+ "shush-1.0.1" = {
name = "shush";
packageName = "shush";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz";
- sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431";
+ url = "https://registry.npmjs.org/shush/-/shush-1.0.1.tgz";
+ sha512 = "baDDBPaPcFwVeQNfj1lYkE/NkqQr1WkXUlOePHnA5I8hw9Fz0Tu72ZC0XENeV4tM9tesaGA/Wi2mW07EOeKRuQ==";
};
};
"side-channel-1.0.4" = {
@@ -61736,13 +61754,13 @@ let
sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
};
};
- "ssb-db2-2.8.10" = {
+ "ssb-db2-2.8.11" = {
name = "ssb-db2";
packageName = "ssb-db2";
- version = "2.8.10";
+ version = "2.8.11";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.10.tgz";
- sha512 = "wa61qZecXECi+/6qok4Mk4Y3uC/cqvjjxF5rVgZZnAm2QXiujwIru0zsCHElfB+MYTw+U5viZTOxwoGaBk0GwA==";
+ url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz";
+ sha512 = "XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg==";
};
};
"ssb-ebt-5.6.7" = {
@@ -61997,13 +62015,13 @@ let
sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA==";
};
};
- "ssb-uri2-1.7.1" = {
+ "ssb-uri2-1.7.2" = {
name = "ssb-uri2";
packageName = "ssb-uri2";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.1.tgz";
- sha512 = "iUzWf4yB+Pf6YZD5r+FV/UB7BZ5zQK57qws3d5hHqsO8QM2DRfU0i8SNFBFGPLvEQL8AT8XKbAhNIVwl/f0PWw==";
+ url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.2.tgz";
+ sha512 = "bw6nkLkpOqiVxYXqYm/7XMnIgTIbIs4crRutCkworysMr08gjFNhkIgOeEm1uG4y1Rm0FIigWaBQnOLqPmXAPQ==";
};
};
"ssb-validate-4.1.4" = {
@@ -62042,13 +62060,13 @@ let
sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
};
};
- "sscaff-1.2.216" = {
+ "sscaff-1.2.221" = {
name = "sscaff";
packageName = "sscaff";
- version = "1.2.216";
+ version = "1.2.221";
src = fetchurl {
- url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.216.tgz";
- sha512 = "wMcmaDSnfbbcFtuRZc2UJUUbM5CQsXJOS27H0vTAMJlvP/MT+GlgtiBVPBIJ2iQGQM49Nhrh8Ec18cHePUCF5w==";
+ url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.221.tgz";
+ sha512 = "C3t2CkhHcfJEjWmntW6m/hMHqU9MEaTOiPew4qn+ax+JW0sMvK0Oix/6BTUNFQHsh0Xcvg1WU+EGd/nlUshojw==";
};
};
"ssh-config-1.1.6" = {
@@ -62699,13 +62717,13 @@ let
sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==";
};
};
- "streamroller-3.0.2" = {
+ "streamroller-3.0.4" = {
name = "streamroller";
packageName = "streamroller";
- version = "3.0.2";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz";
- sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==";
+ url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz";
+ sha512 = "GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w==";
};
};
"streamsearch-0.1.2" = {
@@ -62726,13 +62744,13 @@ let
sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==";
};
};
- "streamx-2.12.2" = {
+ "streamx-2.12.3" = {
name = "streamx";
packageName = "streamx";
- version = "2.12.2";
+ version = "2.12.3";
src = fetchurl {
- url = "https://registry.npmjs.org/streamx/-/streamx-2.12.2.tgz";
- sha512 = "NjGPzm2tnLOOPvbE/yxFoAgdYzvgjZkb9i4LgJokAfhLinMv2M7jevpIja+aP/ridUIfge9DGbB223kVzdrEzA==";
+ url = "https://registry.npmjs.org/streamx/-/streamx-2.12.3.tgz";
+ sha512 = "im2U3yhz6NoJQzzn6AwBlb+MRuGLxlnXJXqZudQ9RZzsVcq9+MHTPGR5b4Rh23RSLQenqtBaMwemM61w10VcWQ==";
};
};
"strftime-0.10.1" = {
@@ -64302,15 +64320,6 @@ let
sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==";
};
};
- "tape-2.3.3" = {
- name = "tape";
- packageName = "tape";
- version = "2.3.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz";
- sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
- };
- };
"tape-4.15.0" = {
name = "tape";
packageName = "tape";
@@ -65715,13 +65724,13 @@ let
sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
};
};
- "torrent-discovery-9.4.7" = {
+ "torrent-discovery-9.4.9" = {
name = "torrent-discovery";
packageName = "torrent-discovery";
- version = "9.4.7";
+ version = "9.4.9";
src = fetchurl {
- url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.7.tgz";
- sha512 = "7Zw474LJE5r3Momi4ykBYkjgcFhENbUxcAFs5cBllUkv9ErJPzPEGmpEuqX7V8TkLS+Clmt/l5CjV5IFHg/A/A==";
+ url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.9.tgz";
+ sha512 = "xU5zLDdX6QMm4zJ+wceunk9nhs3Q/2Lewj/yCLx15lnfugf3Ir4bo/axM3IEwDl+lkH7zWYe/iy2+r/2yyILgQ==";
};
};
"torrent-piece-1.1.2" = {
@@ -66165,13 +66174,13 @@ let
sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw==";
};
};
- "ts-node-10.6.0" = {
+ "ts-node-10.7.0" = {
name = "ts-node";
packageName = "ts-node";
- version = "10.6.0";
+ version = "10.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ts-node/-/ts-node-10.6.0.tgz";
- sha512 = "CJen6+dfOXolxudBQXnVjRVvYTmTWbyz7cn+xq2XTsvnaXbHqr4gXSCNbS2Jj8yTZMuGwUoBESLaOkLascVVvg==";
+ url = "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz";
+ sha512 = "TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==";
};
};
"ts-node-8.9.1" = {
@@ -67362,13 +67371,13 @@ let
sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50";
};
};
- "undici-4.14.1" = {
+ "undici-4.15.0" = {
name = "undici";
packageName = "undici";
- version = "4.14.1";
+ version = "4.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/undici/-/undici-4.14.1.tgz";
- sha512 = "WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ==";
+ url = "https://registry.npmjs.org/undici/-/undici-4.15.0.tgz";
+ sha512 = "kHppwh/y49FLEXl/zYCCbGB0D3nrcWNBczNYCsDdNYzWPs80aQgfKic1PVkJEIc2YlR7m0Lf5i559zbr0AA7FQ==";
};
};
"unherit-1.1.3" = {
@@ -67893,13 +67902,13 @@ let
sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==";
};
};
- "unist-util-stringify-position-3.0.1" = {
+ "unist-util-stringify-position-3.0.2" = {
name = "unist-util-stringify-position";
packageName = "unist-util-stringify-position";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.1.tgz";
- sha512 = "HDVOJ704Uj5QWqoB6KV4CDP62OW9wam9BEuwGE4fvunhVraZcO/fFNBCpvmDDSlkFBG/GAYdHfKvKvDAJxzcWA==";
+ url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz";
+ sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==";
};
};
"unist-util-to-list-of-char-0.1.3" = {
@@ -68370,13 +68379,13 @@ let
sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
};
};
- "urijs-1.19.8" = {
+ "urijs-1.19.10" = {
name = "urijs";
packageName = "urijs";
- version = "1.19.8";
+ version = "1.19.10";
src = fetchurl {
- url = "https://registry.npmjs.org/urijs/-/urijs-1.19.8.tgz";
- sha512 = "iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==";
+ url = "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz";
+ sha512 = "EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg==";
};
};
"urix-0.1.0" = {
@@ -69586,22 +69595,13 @@ let
sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==";
};
};
- "vfile-5.3.0" = {
+ "vfile-5.3.2" = {
name = "vfile";
packageName = "vfile";
- version = "5.3.0";
+ version = "5.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vfile/-/vfile-5.3.0.tgz";
- sha512 = "Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ==";
- };
- };
- "vfile-5.3.1" = {
- name = "vfile";
- packageName = "vfile";
- version = "5.3.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/vfile/-/vfile-5.3.1.tgz";
- sha512 = "EWkoULWVDBV3ozmE21TA0qekXreWJXV1jKcF8rgnvmmH0L9Vm8eTSnuuSSpH2XpLXZLJ0uMMIHUqDLHjK5lh4w==";
+ url = "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz";
+ sha512 = "w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA==";
};
};
"vfile-find-down-1.0.0" = {
@@ -69685,22 +69685,13 @@ let
sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==";
};
};
- "vfile-message-3.1.0" = {
+ "vfile-message-3.1.2" = {
name = "vfile-message";
packageName = "vfile-message";
- version = "3.1.0";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.0.tgz";
- sha512 = "4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g==";
- };
- };
- "vfile-message-3.1.1" = {
- name = "vfile-message";
- packageName = "vfile-message";
- version = "3.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.1.tgz";
- sha512 = "pz5xA88aupQPuXmY46xnGAv8MzAcU1Xi2Do3UftjTdvQHreXCWvJT/BbzYixPNYRek+EAioI0kP3crJu37xa6Q==";
+ url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz";
+ sha512 = "QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==";
};
};
"vfile-reporter-1.5.0" = {
@@ -70027,15 +70018,6 @@ let
sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
};
};
- "vscode-emmet-helper-2.1.2" = {
- name = "vscode-emmet-helper";
- packageName = "vscode-emmet-helper";
- version = "2.1.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz";
- sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w==";
- };
- };
"vscode-emmet-helper-2.6.4" = {
name = "vscode-emmet-helper";
packageName = "vscode-emmet-helper";
@@ -70927,13 +70909,13 @@ let
sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg==";
};
};
- "web3-utils-1.7.0" = {
+ "web3-utils-1.7.1" = {
name = "web3-utils";
packageName = "web3-utils";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.0.tgz";
- sha512 = "O8Tl4Ky40Sp6pe89Olk2FsaUkgHyb5QAXuaKo38ms3CxZZ4d3rPGfjP9DNKGm5+IUgAZBNpF1VmlSmNCqfDI1w==";
+ url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz";
+ sha512 = "fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw==";
};
};
"webassemblyjs-1.11.1" = {
@@ -71044,13 +71026,13 @@ let
sha512 = "NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==";
};
};
- "webpack-5.69.1" = {
+ "webpack-5.70.0" = {
name = "webpack";
packageName = "webpack";
- version = "5.69.1";
+ version = "5.70.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz";
- sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz";
+ sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==";
};
};
"webpack-bundle-analyzer-3.9.0" = {
@@ -71251,13 +71233,13 @@ let
sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw==";
};
};
- "webtorrent-1.8.3" = {
+ "webtorrent-1.8.5" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "1.8.3";
+ version = "1.8.5";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.3.tgz";
- sha512 = "VZRYk0jvMvMpWPjZJi0pg3B8guX7uLLoDgvsxFdF1KKQDBSy8QVwL5BOJaaC3LGi+RYwBIKRGUy4DiW5SMSyng==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.5.tgz";
+ sha512 = "LPiXC/AqHehu0CWTGrmE4IxPSaXY25qe7FQyvBXRfI1w00mf2PkV6g+UeChdGXVJE2uwcFl02UkjNwL+Yjvdlg==";
};
};
"whatwg-encoding-1.0.5" = {
@@ -71368,15 +71350,6 @@ let
sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
};
};
- "when-3.7.8" = {
- name = "when";
- packageName = "when";
- version = "3.7.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz";
- sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82";
- };
- };
"whet.extend-0.9.9" = {
name = "whet.extend";
packageName = "whet.extend";
@@ -72665,13 +72638,13 @@ let
sha1 = "f164263325ae671f53836fb210c7ddbcfda46598";
};
};
- "xss-1.0.10" = {
+ "xss-1.0.11" = {
name = "xss";
packageName = "xss";
- version = "1.0.10";
+ version = "1.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
- sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
+ url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
+ sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
};
};
"xstream-11.14.0" = {
@@ -73561,8 +73534,12 @@ in
dependencies = [
sources."@tootallnate/once-2.0.0"
sources."http-proxy-agent-5.0.0"
- sources."lru-cache-7.4.0"
- sources."make-fetch-happen-10.0.3"
+ sources."lru-cache-7.4.1"
+ (sources."make-fetch-happen-10.0.4" // {
+ dependencies = [
+ sources."minipass-fetch-2.0.2"
+ ];
+ })
];
})
sources."npmlog-6.0.1"
@@ -73986,10 +73963,10 @@ in
"@astrojs/language-server" = nodeEnv.buildNodePackage {
name = "_at_astrojs_slash_language-server";
packageName = "@astrojs/language-server";
- version = "0.8.9";
+ version = "0.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.9.tgz";
- sha512 = "y9f/vsU7kLec98KMcT+76QMVf066ofzoFzFgoGUfACKbqYId8jp4sFAfPwYlDSmL4k2lryo64HCr9pRoG9slIA==";
+ url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.9.1.tgz";
+ sha512 = "Nf35GAmPafcmqiI51PYNa/0Sh82GdCXGrL0jPtBopRQi+TsJJE/kbBB1rqpa082w4YLv2otpaE5apiYUOI8VYg==";
};
dependencies = [
sources."@emmetio/abbreviation-2.2.3"
@@ -73999,6 +73976,11 @@ in
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."@ts-morph/common-0.11.1"
+ (sources."@vscode/emmet-helper-2.8.4" // {
+ dependencies = [
+ sources."vscode-uri-2.1.2"
+ ];
+ })
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
@@ -74028,11 +74010,6 @@ in
sources."ts-morph-12.2.0"
sources."typescript-4.6.2"
sources."vscode-css-languageservice-5.1.13"
- (sources."vscode-emmet-helper-2.1.2" // {
- dependencies = [
- sources."vscode-uri-2.1.2"
- ];
- })
(sources."vscode-html-languageservice-3.2.0" // {
dependencies = [
sources."vscode-languageserver-types-3.16.0-next.2"
@@ -74491,7 +74468,7 @@ in
sources."through-2.3.8"
sources."through2-4.0.2"
sources."trim-newlines-3.0.1"
- sources."ts-node-10.6.0"
+ sources."ts-node-10.7.0"
sources."type-fest-0.18.1"
sources."typescript-4.6.2"
sources."universalify-2.0.0"
@@ -75133,7 +75110,7 @@ in
sources."stream-collector-1.0.1"
sources."stream-equal-1.1.1"
sources."stream-shift-1.0.1"
- sources."streamx-2.12.2"
+ sources."streamx-2.12.3"
(sources."string-width-4.2.3" // {
dependencies = [
sources."ansi-regex-5.0.1"
@@ -76153,7 +76130,7 @@ in
sources."@octokit/plugin-request-log-1.0.4"
sources."@octokit/plugin-rest-endpoint-methods-5.13.0"
sources."@octokit/plugin-retry-3.0.9"
- sources."@octokit/plugin-throttling-3.5.2"
+ sources."@octokit/plugin-throttling-3.6.1"
sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
@@ -76244,15 +76221,15 @@ in
"@nestjs/cli" = nodeEnv.buildNodePackage {
name = "_at_nestjs_slash_cli";
packageName = "@nestjs/cli";
- version = "8.2.1";
+ version = "8.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.1.tgz";
- sha512 = "GnwpORSIkGl6N6yWPONq1wwZ8+zltr3vF1M/2qzupDnXOAvSSCh1otDQRAmeOf3uIIeCiCsJEEx79kRnT7Zdrw==";
+ url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.2.tgz";
+ sha512 = "ZonmNLCHfTVrZGgYf4mrpivnKGaRzVRAcux+WDbzhQDNIz70s7mdOPShXW1Vpq+7uRJDxlgO1vOMhmg4uEUIDg==";
};
dependencies = [
- sources."@angular-devkit/core-13.2.3"
- sources."@angular-devkit/schematics-13.2.3"
- (sources."@angular-devkit/schematics-cli-13.2.3" // {
+ sources."@angular-devkit/core-13.2.5"
+ sources."@angular-devkit/schematics-13.2.5"
+ (sources."@angular-devkit/schematics-cli-13.2.5" // {
dependencies = [
sources."chalk-4.1.2"
sources."inquirer-8.2.0"
@@ -76306,24 +76283,23 @@ in
sources."acorn-import-assertions-1.8.0"
sources."ajv-8.9.0"
sources."ajv-formats-2.1.1"
- sources."ajv-keywords-3.5.2"
+ sources."ajv-keywords-5.1.0"
sources."ansi-colors-4.1.1"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.2"
- sources."at-least-node-1.0.0"
sources."balanced-match-1.0.2"
sources."base64-js-1.5.1"
sources."binary-extensions-2.2.0"
sources."bl-4.1.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-5.7.1"
sources."buffer-from-1.1.2"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.3"
@@ -76338,18 +76314,14 @@ in
sources."colors-1.4.0"
sources."commander-4.1.1"
sources."concat-map-0.0.1"
- sources."cosmiconfig-6.0.0"
+ sources."cosmiconfig-7.0.1"
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
- (sources."enhanced-resolve-5.9.1" // {
- dependencies = [
- sources."tapable-2.2.1"
- ];
- })
+ sources."enhanced-resolve-5.9.2"
sources."error-ex-1.3.2"
sources."es-module-lexer-0.9.3"
sources."escalade-3.1.1"
@@ -76368,10 +76340,9 @@ in
sources."fast-json-stable-stringify-2.1.0"
sources."figures-3.2.0"
sources."fill-range-7.0.1"
- (sources."fork-ts-checker-webpack-plugin-6.5.0" // {
+ (sources."fork-ts-checker-webpack-plugin-7.2.1" // {
dependencies = [
sources."chalk-4.1.2"
- sources."fs-extra-9.1.0"
];
})
sources."fs-extra-10.0.1"
@@ -76478,12 +76449,7 @@ in
sources."rxjs-6.6.7"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- (sources."schema-utils-2.7.0" // {
- dependencies = [
- sources."ajv-6.12.6"
- sources."json-schema-traverse-0.4.1"
- ];
- })
+ sources."schema-utils-4.0.0"
sources."semver-7.3.5"
sources."serialize-javascript-6.0.0"
sources."shebang-command-2.0.0"
@@ -76505,7 +76471,7 @@ in
sources."supports-color-7.2.0"
sources."supports-preserve-symlinks-flag-1.0.0"
sources."symbol-observable-4.0.0"
- sources."tapable-1.1.3"
+ sources."tapable-2.2.1"
(sources."terser-5.12.0" // {
dependencies = [
sources."commander-2.20.3"
@@ -76514,6 +76480,7 @@ in
(sources."terser-webpack-plugin-5.3.1" // {
dependencies = [
sources."ajv-6.12.6"
+ sources."ajv-keywords-3.5.2"
sources."json-schema-traverse-0.4.1"
sources."schema-utils-3.1.1"
sources."source-map-0.6.1"
@@ -76531,7 +76498,7 @@ in
})
sources."tslib-1.14.1"
sources."type-fest-0.21.3"
- sources."typescript-4.5.5"
+ sources."typescript-4.6.2"
sources."universalify-2.0.0"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
@@ -76540,9 +76507,9 @@ in
(sources."webpack-5.66.0" // {
dependencies = [
sources."ajv-6.12.6"
+ sources."ajv-keywords-3.5.2"
sources."json-schema-traverse-0.4.1"
sources."schema-utils-3.1.1"
- sources."tapable-2.2.1"
];
})
sources."webpack-node-externals-3.0.0"
@@ -76641,10 +76608,10 @@ in
"@tailwindcss/forms" = nodeEnv.buildNodePackage {
name = "_at_tailwindcss_slash_forms";
packageName = "@tailwindcss/forms";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz";
- sha512 = "DeaQBx6EgEeuZPQACvC+mKneJsD8am1uiJugjgQK1+/Vt+Ai0GpFBC2T2fqnUad71WgOxyrZPE6BG1VaI6YqfQ==";
+ url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.0.tgz";
+ sha512 = "KzWugryEBFkmoaYcBE18rs6gthWCFHHO7cAZm2/hv3hwD67AzwP7udSCa22E7R1+CEJL/FfhYsJWrc0b1aeSzw==";
};
dependencies = [
sources."mini-svg-data-uri-1.4.3"
@@ -76720,10 +76687,10 @@ in
"@uppy/companion" = nodeEnv.buildNodePackage {
name = "_at_uppy_slash_companion";
packageName = "@uppy/companion";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.0.tgz";
- sha512 = "/TF95YAYNcuuyfxuYDm+82ployEafonT8MDP5oVZr1zdqRGjyrAiOfAWiCjONPWVKVa/mp6Jj8WPgnzLzuA13Q==";
+ url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.1.tgz";
+ sha512 = "ke+qyGzYpUWsOgqSbwM6Ok3f6nqXmh4WdfFa3LGKgaNs8mHv4ss/06a3NwAYEGrUSaCNOCNa3+snwUE4rMQ5OA==";
};
dependencies = [
sources."@purest/config-1.0.1"
@@ -76743,7 +76710,7 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.1084.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -77332,7 +77299,7 @@ in
})
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -77351,7 +77318,7 @@ in
})
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."caw-2.0.1"
sources."chalk-4.1.2"
sources."chardet-0.7.0"
@@ -77472,7 +77439,7 @@ in
sources."easy-stack-1.0.1"
sources."ee-first-1.1.1"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -77572,7 +77539,7 @@ in
sources."which-2.0.2"
];
})
- sources."flow-parser-0.172.0"
+ sources."flow-parser-0.173.0"
sources."for-each-0.3.3"
sources."for-in-1.0.2"
sources."forwarded-0.2.0"
@@ -78149,7 +78116,7 @@ in
sources."ws-7.5.7"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
- (sources."xss-1.0.10" // {
+ (sources."xss-1.0.11" // {
dependencies = [
sources."commander-2.20.3"
];
@@ -78803,7 +78770,7 @@ in
sources."unist-util-position-4.0.1"
sources."unist-util-position-from-estree-1.1.1"
sources."unist-util-remove-position-4.0.1"
- sources."unist-util-stringify-position-3.0.1"
+ sources."unist-util-stringify-position-3.0.2"
(sources."unist-util-visit-4.1.0" // {
dependencies = [
sources."unist-util-visit-parents-5.1.0"
@@ -78825,10 +78792,10 @@ in
sources."util-deprecate-1.0.2"
sources."uvu-0.5.3"
sources."validate-npm-package-license-3.0.4"
- sources."vfile-5.3.0"
+ sources."vfile-5.3.2"
sources."vfile-find-up-6.0.0"
sources."vfile-location-4.0.1"
- sources."vfile-message-3.1.0"
+ sources."vfile-message-3.1.2"
(sources."vfile-reporter-7.0.3" // {
dependencies = [
sources."ansi-regex-6.0.1"
@@ -78913,8 +78880,8 @@ in
sources."async-3.2.3"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.19.3"
- sources."caniuse-lite-1.0.30001312"
+ sources."browserslist-4.20.0"
+ sources."caniuse-lite-1.0.30001313"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -78924,7 +78891,7 @@ in
sources."convert-source-map-1.8.0"
sources."debug-4.3.3"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -79173,7 +79140,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
sources."uri-js-4.4.1"
- sources."urijs-1.19.8"
+ sources."urijs-1.19.10"
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
@@ -79294,11 +79261,11 @@ in
sha512 = "9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==";
};
dependencies = [
- sources."browserslist-4.19.3"
- sources."caniuse-lite-1.0.30001312"
- sources."electron-to-chromium-1.4.75"
+ sources."browserslist-4.20.0"
+ sources."caniuse-lite-1.0.30001313"
+ sources."electron-to-chromium-1.4.76"
sources."escalade-3.1.1"
- sources."fraction.js-4.1.3"
+ sources."fraction.js-4.2.0"
sources."node-releases-2.0.2"
sources."normalize-range-0.1.2"
sources."picocolors-1.0.0"
@@ -79331,7 +79298,7 @@ in
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."ast-types-0.13.4"
- (sources."aws-sdk-2.1084.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -79949,10 +79916,10 @@ in
balanceofsatoshis = nodeEnv.buildNodePackage {
name = "balanceofsatoshis";
packageName = "balanceofsatoshis";
- version = "11.56.0";
+ version = "11.57.0";
src = fetchurl {
- url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.56.0.tgz";
- sha512 = "Am07Njmv2VGXapth/SVz80+5LE5+LDtPSmFC8f7uyG/8KGaEHHPnry+tskWsiOPEe+lwbbLry78iWSNgOtiffQ==";
+ url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.57.0.tgz";
+ sha512 = "uL32sXEpka9XF0l8u5xTeGLUhAUE1UySX3myN//c9YibcVhLHJG/ZYAY3wYZQZ+15bI61giduMCwB1Kv/XmAGw==";
};
dependencies = [
(sources."@alexbosworth/caporal-1.4.0" // {
@@ -80345,7 +80312,32 @@ in
sources."ws-8.2.3"
];
})
- (sources."ln-service-53.9.2" // {
+ (sources."ln-service-53.9.3" // {
+ dependencies = [
+ sources."@grpc/grpc-js-1.5.7"
+ sources."@types/ws-8.5.2"
+ sources."body-parser-1.19.2"
+ sources."bolt09-0.2.2"
+ sources."bytes-3.1.2"
+ sources."cookie-0.4.2"
+ sources."express-4.17.3"
+ sources."lightning-5.8.2"
+ sources."qs-6.9.7"
+ sources."raw-body-2.4.3"
+ sources."safe-buffer-5.2.1"
+ sources."tiny-secp256k1-2.2.1"
+ sources."type-fest-2.12.0"
+ sources."uint8array-tools-0.0.7"
+ sources."ws-8.5.0"
+ ];
+ })
+ (sources."ln-sync-3.11.0" // {
+ dependencies = [
+ sources."tiny-secp256k1-2.2.1"
+ sources."uint8array-tools-0.0.7"
+ ];
+ })
+ (sources."ln-telegram-3.19.1" // {
dependencies = [
sources."@grpc/grpc-js-1.5.5"
sources."@types/node-17.0.18"
@@ -80367,6 +80359,21 @@ in
sources."raw-body-2.4.2"
];
})
+ sources."ln-service-53.9.2"
+ (sources."ln-sync-3.10.1" // {
+ dependencies = [
+ sources."@types/node-17.0.17"
+ sources."body-parser-1.19.1"
+ sources."bolt09-0.2.1"
+ sources."bytes-3.1.1"
+ sources."cookie-0.4.1"
+ sources."express-4.17.2"
+ sources."lightning-5.7.1"
+ sources."ln-service-53.8.1"
+ sources."qs-6.9.6"
+ sources."raw-body-2.4.2"
+ ];
+ })
sources."qs-6.9.7"
sources."raw-body-2.4.3"
sources."safe-buffer-5.2.1"
@@ -80374,17 +80381,6 @@ in
sources."ws-8.5.0"
];
})
- (sources."ln-sync-3.10.1" // {
- dependencies = [
- sources."@grpc/grpc-js-1.5.5"
- sources."@types/node-17.0.17"
- sources."lightning-5.7.1"
- sources."ln-service-53.8.1"
- sources."type-fest-2.11.2"
- sources."ws-8.5.0"
- ];
- })
- sources."ln-telegram-3.19.1"
sources."lodash-4.17.21"
sources."lodash.camelcase-4.3.0"
sources."lodash.difference-4.5.0"
@@ -80468,8 +80464,50 @@ in
})
(sources."paid-services-3.12.1" // {
dependencies = [
+ sources."@grpc/grpc-js-1.5.5"
+ sources."@types/node-17.0.18"
+ sources."body-parser-1.19.2"
+ sources."bolt09-0.2.2"
+ sources."bytes-3.1.2"
+ sources."cookie-0.4.2"
+ sources."express-4.17.3"
+ (sources."lightning-5.8.1" // {
+ dependencies = [
+ sources."bytes-3.1.1"
+ sources."cookie-0.4.1"
+ (sources."express-4.17.2" // {
+ dependencies = [
+ sources."body-parser-1.19.1"
+ ];
+ })
+ sources."qs-6.9.6"
+ sources."raw-body-2.4.2"
+ sources."tiny-secp256k1-2.2.0"
+ ];
+ })
+ sources."ln-service-53.9.2"
+ (sources."ln-sync-3.10.1" // {
+ dependencies = [
+ sources."@types/node-17.0.17"
+ sources."body-parser-1.19.1"
+ sources."bolt09-0.2.1"
+ sources."bytes-3.1.1"
+ sources."cookie-0.4.1"
+ sources."express-4.17.2"
+ sources."lightning-5.7.1"
+ sources."ln-service-53.8.1"
+ sources."qs-6.9.6"
+ sources."raw-body-2.4.2"
+ sources."tiny-secp256k1-2.2.0"
+ ];
+ })
+ sources."qs-6.9.7"
+ sources."raw-body-2.4.3"
+ sources."safe-buffer-5.2.1"
sources."tiny-secp256k1-2.2.1"
+ sources."type-fest-2.11.2"
sources."uint8array-tools-0.0.7"
+ sources."ws-8.5.0"
];
})
sources."parseurl-1.3.3"
@@ -80746,7 +80784,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
sources."uri-js-4.4.1"
- sources."urijs-1.19.8"
+ sources."urijs-1.19.10"
sources."uuid-3.4.0"
sources."verror-1.10.0"
sources."vscode-jsonrpc-6.0.0"
@@ -83059,10 +83097,10 @@ in
cdk8s-cli = nodeEnv.buildNodePackage {
name = "cdk8s-cli";
packageName = "cdk8s-cli";
- version = "1.0.111";
+ version = "1.0.116";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.111.tgz";
- sha512 = "UcChIatml058bkeCiB+Wkx1ThTgzS1qPxdG4/DpsbWeSSLBwEBl9PXChBcpHSMI0d4UWygbQLlkAdaDKijcD2Q==";
+ url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.116.tgz";
+ sha512 = "LNbUuGtIWglPVj+FzyTSH7fH9jiQGKIFkJqmJuSO3wau21DU5ULP+GEmNd27a7lfMBqFJBKTNwyNzJTKUSz3Zw==";
};
dependencies = [
sources."@jsii/check-node-1.54.0"
@@ -83081,8 +83119,8 @@ in
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
sources."case-1.6.3"
- sources."cdk8s-1.5.30"
- sources."cdk8s-plus-22-1.0.0-beta.131"
+ sources."cdk8s-1.5.35"
+ sources."cdk8s-plus-22-1.0.0-beta.137"
sources."chalk-4.1.2"
sources."cliui-7.0.4"
sources."clone-2.1.2"
@@ -83095,8 +83133,8 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.30.0"
- sources."constructs-3.3.231"
- sources."date-format-4.0.3"
+ sources."constructs-3.3.236"
+ sources."date-format-4.0.4"
sources."debug-4.3.3"
sources."decamelize-5.0.1"
sources."deep-equal-2.0.5"
@@ -83182,18 +83220,18 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.490" // {
+ (sources."jsii-srcmak-0.1.495" // {
dependencies = [
sources."fs-extra-9.1.0"
];
})
sources."json-schema-0.4.0"
sources."json-schema-traverse-1.0.0"
- sources."json2jsii-0.2.150"
+ sources."json2jsii-0.2.155"
sources."jsonfile-6.1.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
- sources."log4js-6.4.1"
+ sources."log4js-6.4.2"
sources."lower-case-2.0.2"
sources."lru-cache-6.0.0"
sources."mdurl-1.0.1"
@@ -83233,8 +83271,8 @@ in
sources."snake-case-3.0.4"
sources."sort-json-2.0.1"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.216"
- (sources."streamroller-3.0.2" // {
+ sources."sscaff-1.2.221"
+ (sources."streamroller-3.0.4" // {
dependencies = [
sources."fs-extra-10.0.1"
];
@@ -83343,8 +83381,8 @@ in
sources."combined-stream-1.0.8"
sources."commonmark-0.30.0"
sources."concat-map-0.0.1"
- sources."constructs-10.0.76"
- sources."date-format-4.0.3"
+ sources."constructs-10.0.81"
+ sources."date-format-4.0.4"
sources."debug-4.3.3"
sources."decamelize-1.2.0"
sources."deep-equal-2.0.5"
@@ -83480,7 +83518,7 @@ in
sources."yargs-parser-20.2.9"
];
})
- (sources."jsii-srcmak-0.1.490" // {
+ (sources."jsii-srcmak-0.1.495" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -83491,7 +83529,7 @@ in
sources."jsonfile-4.0.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
- sources."log4js-6.4.1"
+ sources."log4js-6.4.2"
sources."lru-cache-6.0.0"
sources."mdurl-1.0.1"
sources."merge2-1.4.1"
@@ -83537,7 +83575,7 @@ in
sources."sort-json-2.0.1"
sources."source-map-0.5.7"
sources."spdx-license-list-6.4.0"
- (sources."streamroller-3.0.2" // {
+ (sources."streamroller-3.0.4" // {
dependencies = [
sources."fs-extra-10.0.1"
sources."jsonfile-6.1.0"
@@ -84215,7 +84253,7 @@ in
sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ==";
};
dependencies = [
- sources."@chemzqm/neovim-5.7.4"
+ sources."@chemzqm/neovim-5.7.5"
sources."@tootallnate/once-1.1.2"
sources."agent-base-6.0.2"
sources."arch-2.2.0"
@@ -84244,7 +84282,7 @@ in
sources."which-1.3.1"
];
})
- sources."date-format-4.0.3"
+ sources."date-format-4.0.4"
sources."debounce-1.2.1"
sources."debug-4.3.3"
sources."deep-extend-0.6.0"
@@ -84313,7 +84351,7 @@ in
];
})
sources."lodash-4.17.21"
- sources."log4js-6.4.1"
+ sources."log4js-6.4.2"
sources."lru-cache-6.0.0"
sources."metals-languageclient-0.4.2"
sources."minimatch-3.1.2"
@@ -84363,7 +84401,7 @@ in
sources."shell-quote-1.7.3"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
- sources."streamroller-3.0.2"
+ sources."streamroller-3.0.4"
sources."string.prototype.trimend-1.0.4"
sources."string.prototype.trimstart-1.0.4"
(sources."string_decoder-1.1.1" // {
@@ -84455,7 +84493,7 @@ in
sha512 = "ILWzT0OqD24ppvGnVmjQZYygUtDWAVxvLeXkcsJuIk4ED8O9ezFbPbD3GeBrLWG87X3mC37vb/k6EsF1BR6pUQ==";
};
dependencies = [
- sources."pyright-1.1.226"
+ sources."pyright-1.1.227"
];
buildInputs = globalBuildInputs;
meta = {
@@ -84565,10 +84603,10 @@ in
coc-snippets = nodeEnv.buildNodePackage {
name = "coc-snippets";
packageName = "coc-snippets";
- version = "2.5.7";
+ version = "2.5.9";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.5.7.tgz";
- sha512 = "ruWc4BFR78x2EQMoLUkdAi2yeoipIuNwbl88VX8bPNbVVB1kB22VqDJ9TqcDU6az8VP2tQd0V4V/ZsdeLgBF6g==";
+ url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.5.9.tgz";
+ sha512 = "EOl0uBpNm34r1I5IotKsrJPV7I01cAd2MDKyHV2FQfWF3KJoCnPuhPfh17Gy7Ji94I7bSt03qNrawk+9476x6Q==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -84663,11 +84701,11 @@ in
];
})
sources."braces-3.0.2"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -84704,7 +84742,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -86609,7 +86647,7 @@ in
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."cp-file-9.1.0"
- sources."cpy-9.0.0"
+ sources."cpy-9.0.1"
sources."decamelize-5.0.1"
(sources."decamelize-keys-1.1.0" // {
dependencies = [
@@ -87023,7 +87061,7 @@ in
sources."@cspell/dict-dart-1.1.0"
sources."@cspell/dict-django-2.0.0"
sources."@cspell/dict-dotnet-2.0.0"
- sources."@cspell/dict-elixir-2.0.0"
+ sources."@cspell/dict-elixir-2.0.1"
sources."@cspell/dict-en-gb-1.1.33"
sources."@cspell/dict-en_us-2.1.7"
sources."@cspell/dict-filetypes-2.0.1"
@@ -87044,10 +87082,10 @@ in
sources."@cspell/dict-public-licenses-1.0.4"
sources."@cspell/dict-python-2.0.6"
sources."@cspell/dict-r-1.0.2"
- sources."@cspell/dict-ruby-2.0.0"
+ sources."@cspell/dict-ruby-2.0.1"
sources."@cspell/dict-rust-2.0.0"
sources."@cspell/dict-scala-2.0.0"
- sources."@cspell/dict-software-terms-2.1.1"
+ sources."@cspell/dict-software-terms-2.1.2"
sources."@cspell/dict-swift-1.0.2"
sources."@cspell/dict-typescript-2.0.0"
sources."@cspell/dict-vue-2.0.2"
@@ -87943,7 +87981,7 @@ in
sources."@babel/template-7.16.7"
sources."@babel/traverse-7.17.3"
sources."@babel/types-7.17.0"
- sources."@blueprintjs/colors-4.0.0-beta.3"
+ sources."@blueprintjs/colors-4.0.0-rc.0"
sources."@blueprintjs/core-3.53.0"
sources."@blueprintjs/icons-3.32.0"
sources."@deltachat/message_parser_wasm-0.1.0"
@@ -88020,7 +88058,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-crc32-0.2.13"
sources."buffer-from-1.1.2"
sources."cache-base-1.0.1"
@@ -88031,7 +88069,7 @@ in
];
})
sources."call-bind-1.0.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
(sources."class-utils-0.3.6" // {
@@ -88080,7 +88118,7 @@ in
sources."core-util-is-1.0.3"
sources."crypto-random-string-1.0.0"
sources."csscolorparser-1.0.3"
- sources."csstype-3.0.10"
+ sources."csstype-3.0.11"
sources."debounce-1.2.1"
sources."debug-4.3.3"
sources."decode-uri-component-0.2.0"
@@ -88098,7 +88136,7 @@ in
sources."duplexer3-0.1.4"
sources."earcut-2.2.3"
sources."electron-13.6.9"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-js-clean-4.0.0"
sources."emoji-mart-3.0.1"
sources."emoji-regex-9.2.2"
@@ -88675,10 +88713,10 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.80.1";
+ version = "6.81.0";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.80.1.tgz";
- sha512 = "s3E6aSo3DLkdrjuB4WhMDTzezvj/aLd+SBBQZMoZAX87u/2s/DnGjl9JLBJzhc+9zrhKAezYwu6d2p5lLF8WDQ==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.81.0.tgz";
+ sha512 = "1arvWQ1t2RILTEa90GW3LAMkAEO5Vjw7i8+pFHs7tbFu16XclvTfEFoD2a9/YiB7CwZQPSGQKZy1XUEYqI21tg==";
};
dependencies = [
sources."@fast-csv/format-4.3.5"
@@ -88690,7 +88728,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.920.0"
+ sources."aws-sdk-2.1085.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."base64-js-1.5.1"
@@ -88703,7 +88741,7 @@ in
sources."combined-stream-1.0.8"
sources."core-util-is-1.0.2"
sources."dashdash-1.14.1"
- sources."delay-4.4.1"
+ sources."delay-5.0.0"
sources."delayed-stream-1.0.0"
sources."ecc-jsbn-0.1.2"
sources."eventemitter3-4.0.7"
@@ -88732,7 +88770,7 @@ in
sources."is-typedarray-1.0.0"
sources."isarray-1.0.0"
sources."isstream-0.1.2"
- sources."jmespath-0.15.0"
+ sources."jmespath-0.16.0"
sources."jsbn-0.1.1"
sources."json-schema-0.4.0"
sources."json-schema-traverse-0.4.1"
@@ -88769,7 +88807,7 @@ in
];
})
sources."request-2.88.2"
- sources."requestretry-4.1.2"
+ sources."requestretry-7.0.2"
sources."s3-stream-upload-2.0.2"
sources."s3signed-0.1.0"
sources."s3urls-1.5.2"
@@ -88804,7 +88842,6 @@ in
sources."util-deprecate-1.0.2"
sources."uuid-3.3.2"
sources."verror-1.10.0"
- sources."when-3.7.8"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
];
@@ -89487,13 +89524,13 @@ in
sources."auto-bind-4.0.0"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."caller-callsite-4.1.0"
sources."caller-path-3.0.1"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -89522,7 +89559,7 @@ in
];
})
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
@@ -91918,7 +91955,7 @@ in
];
})
sources."@types/yargs-15.0.14"
- sources."@types/yargs-parser-20.2.1"
+ sources."@types/yargs-parser-21.0.0"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -92064,7 +92101,7 @@ in
];
})
sources."browserify-zlib-0.2.0"
- (sources."browserslist-4.19.3" // {
+ (sources."browserslist-4.20.0" // {
dependencies = [
sources."picocolors-1.0.0"
];
@@ -92098,7 +92135,7 @@ in
})
sources."camelcase-6.3.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -92356,7 +92393,7 @@ in
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -93939,7 +93976,7 @@ in
sources."base64-js-1.5.1"
sources."bl-4.1.0"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-5.7.1"
sources."buffer-crc32-0.2.13"
sources."caller-callsite-4.1.0"
@@ -93947,7 +93984,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."chalk-2.4.2"
sources."chownr-1.1.4"
sources."ci-info-2.0.0"
@@ -93972,7 +94009,7 @@ in
})
sources."delay-5.0.0"
sources."devtools-protocol-0.0.960912"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."error-ex-1.3.2"
@@ -94548,10 +94585,10 @@ in
firebase-tools = nodeEnv.buildNodePackage {
name = "firebase-tools";
packageName = "firebase-tools";
- version = "10.2.1";
+ version = "10.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.1.tgz";
- sha512 = "MBAN5fMMiP8eUfh3pNXREOPzsjp6VpOLAWxD/h2+qLGqzmS3A1S/PQA+VCx46+ebkeo8oilNaVbNLAN/+yAbLw==";
+ url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.2.tgz";
+ sha512 = "KJ7C0HeZr01/uKSuU/pJ2ZUAm0OQvujkmdpKurkV4x/JQHh5MeZvCsPC+Zwn4uqTCaSpY1XZt3167c+jscgv7w==";
};
dependencies = [
(sources."@apidevtools/json-schema-ref-parser-9.0.9" // {
@@ -95872,7 +95909,7 @@ in
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."verror-1.10.0"
- sources."web3-utils-1.7.0"
+ sources."web3-utils-1.7.1"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
sources."which-module-2.0.0"
@@ -95959,7 +95996,7 @@ in
})
sources."cache-base-1.0.1"
sources."call-bind-1.0.2"
- sources."caller-0.0.1"
+ sources."caller-1.0.1"
sources."chokidar-2.1.8"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -96009,7 +96046,6 @@ in
sources."deep-equal-2.0.5"
sources."define-properties-1.1.3"
sources."define-property-2.0.2"
- sources."defined-0.0.0"
sources."director-1.2.7"
sources."dot-prop-4.2.1"
sources."duplexer-0.1.2"
@@ -96129,7 +96165,6 @@ in
sources."isarray-2.0.5"
sources."isobject-3.0.1"
sources."isstream-0.1.2"
- sources."jsonify-0.0.0"
sources."kind-of-6.0.3"
sources."kuler-2.0.0"
sources."lazy-1.0.11"
@@ -96224,7 +96259,6 @@ in
sources."repeat-element-1.1.4"
sources."repeat-string-1.6.1"
sources."resolve-url-0.2.1"
- sources."resumer-0.0.0"
sources."ret-0.1.15"
sources."revalidator-0.1.8"
sources."rimraf-2.7.1"
@@ -96237,7 +96271,7 @@ in
sources."is-extendable-0.1.1"
];
})
- sources."shush-1.0.0"
+ sources."shush-1.0.1"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
sources."simple-swizzle-0.2.2"
@@ -96297,12 +96331,7 @@ in
sources."string.prototype.trimend-1.0.4"
sources."string.prototype.trimstart-1.0.4"
sources."string_decoder-1.1.1"
- sources."strip-json-comments-0.1.3"
- (sources."tape-2.3.3" // {
- dependencies = [
- sources."deep-equal-0.1.2"
- ];
- })
+ sources."strip-json-comments-2.0.1"
sources."text-hex-1.0.0"
sources."through-2.3.8"
(sources."to-object-path-0.3.0" // {
@@ -96507,7 +96536,7 @@ in
sources."boolbase-1.0.0"
sources."boxen-5.1.2"
sources."brace-expansion-1.1.11"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."cacheable-lookup-5.0.4"
(sources."cacheable-request-7.0.2" // {
dependencies = [
@@ -96516,7 +96545,7 @@ in
})
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -96580,7 +96609,7 @@ in
sources."domutils-2.8.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."entities-2.2.0"
@@ -96683,7 +96712,7 @@ in
sources."keyv-4.1.1"
sources."kleur-3.0.3"
sources."latest-version-5.1.0"
- sources."lmdb-2.2.3"
+ sources."lmdb-2.2.4"
sources."locate-path-5.0.0"
sources."lock-1.1.0"
sources."lodash-4.17.21"
@@ -97251,7 +97280,7 @@ in
sources."remove-markdown-0.1.0"
sources."ret-0.1.15"
sources."safe-buffer-5.2.1"
- sources."secret-handshake-1.1.20"
+ sources."secret-handshake-1.1.21"
sources."semver-5.7.1"
sources."separator-escape-0.0.1"
sources."sha.js-2.4.5"
@@ -98617,7 +98646,7 @@ in
sources."@graphql-tools/load-7.5.2"
sources."@graphql-tools/merge-8.2.3"
sources."@graphql-tools/schema-8.3.2"
- (sources."@graphql-tools/url-loader-7.7.2" // {
+ (sources."@graphql-tools/url-loader-7.8.0" // {
dependencies = [
(sources."subscriptions-transport-ws-0.11.0" // {
dependencies = [
@@ -98628,7 +98657,7 @@ in
];
})
sources."@graphql-tools/utils-8.6.2"
- sources."@graphql-tools/wrap-8.4.2"
+ sources."@graphql-tools/wrap-8.4.3"
sources."@iarna/toml-2.2.5"
sources."@n1ru4l/graphql-live-query-0.9.0"
sources."@nodelib/fs.scandir-2.1.5"
@@ -98930,7 +98959,7 @@ in
sources."ts-node-9.1.1"
sources."tslib-2.3.1"
sources."type-is-1.6.18"
- sources."undici-4.14.1"
+ sources."undici-4.15.0"
sources."uniq-1.0.1"
sources."universalify-0.1.2"
sources."unixify-1.0.0"
@@ -100459,7 +100488,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.1084.0"
+ sources."aws-sdk-2.1087.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.11.0"
sources."base64-js-1.5.1"
@@ -102068,7 +102097,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.1084.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -102943,10 +102972,10 @@ in
json-diff = nodeEnv.buildNodePackage {
name = "json-diff";
packageName = "json-diff";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.1.tgz";
- sha512 = "/LxjcgeDIZwFB1HHTShKAYs2NaxAgwUQjXKvrFLDvw3KqvbffFmy5ZeeamxoSLgQG89tRs9+CFKiR3lJAPPhDw==";
+ url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.2.tgz";
+ sha512 = "m+rr5cvC8gML9iB8FatQpQ/NEBJ7LHUFMM4KoNfmCfhTElm42SnqslCGKpYB+Dt1NgkibRVrGP0ZAO3TOU1hpA==";
};
dependencies = [
sources."cli-color-2.0.1"
@@ -103910,7 +103939,7 @@ in
];
})
sources."@oclif/screen-1.0.4"
- (sources."@putdotio/api-client-8.29.0" // {
+ (sources."@putdotio/api-client-8.30.0" // {
dependencies = [
sources."axios-0.21.4"
];
@@ -104092,7 +104121,7 @@ in
sources."typedarray-to-buffer-3.1.5"
sources."universalify-0.1.2"
sources."uri-js-4.4.1"
- sources."urijs-1.19.8"
+ sources."urijs-1.19.10"
sources."uuid-8.3.2"
sources."which-1.3.1"
sources."widest-line-3.1.0"
@@ -104168,7 +104197,7 @@ in
sources."cookie-0.4.2"
sources."cors-2.8.5"
sources."custom-event-1.0.1"
- sources."date-format-4.0.3"
+ sources."date-format-4.0.4"
sources."debug-2.6.9"
sources."depd-1.1.2"
sources."di-0.0.1"
@@ -104212,7 +104241,7 @@ in
sources."isbinaryfile-4.0.8"
sources."jsonfile-6.1.0"
sources."lodash-4.17.21"
- (sources."log4js-6.4.1" // {
+ (sources."log4js-6.4.2" // {
dependencies = [
sources."debug-4.3.3"
sources."ms-2.1.2"
@@ -104260,7 +104289,7 @@ in
})
sources."source-map-0.6.1"
sources."statuses-1.5.0"
- (sources."streamroller-3.0.2" // {
+ (sources."streamroller-3.0.4" // {
dependencies = [
sources."debug-4.3.3"
sources."ms-2.1.2"
@@ -104404,12 +104433,12 @@ in
sources."brace-expansion-1.1.11"
sources."browser-or-node-1.3.0"
sources."browser-process-hrtime-1.0.0"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-from-1.1.2"
sources."bytes-3.1.2"
sources."bytesish-0.4.4"
sources."call-bind-1.0.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chardet-1.4.0"
@@ -104464,7 +104493,7 @@ in
})
sources."dotenv-8.6.0"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."enquirer-2.3.6"
@@ -106275,7 +106304,7 @@ in
sources."depd-1.1.2"
];
})
- sources."http-parser-js-0.5.5"
+ sources."http-parser-js-0.5.6"
sources."inherits-2.0.4"
sources."is-accessor-descriptor-1.0.0"
sources."is-binary-path-1.0.1"
@@ -107137,7 +107166,7 @@ in
sources."@types/normalize-package-data-2.4.1"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.14"
- sources."@types/yargs-parser-20.2.1"
+ sources."@types/yargs-parser-21.0.0"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -107290,7 +107319,7 @@ in
];
})
sources."browserify-zlib-0.2.0"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."bser-2.1.1"
sources."buffer-5.2.1"
sources."buffer-from-1.1.2"
@@ -107306,7 +107335,7 @@ in
sources."cached-path-relative-1.1.0"
sources."call-bind-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -107429,7 +107458,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -107670,7 +107699,7 @@ in
sources."lodash.debounce-4.0.8"
sources."lodash.memoize-3.0.4"
sources."lru-cache-5.1.1"
- sources."magic-string-0.25.7"
+ sources."magic-string-0.25.9"
sources."make-dir-3.1.0"
sources."makeerror-1.0.12"
sources."map-cache-0.2.2"
@@ -109127,7 +109156,7 @@ in
})
sources."debug-4.3.3"
sources."delaunator-5.0.0"
- sources."devtools-protocol-0.0.960912"
+ sources."devtools-protocol-0.0.969999"
sources."dompurify-2.3.5"
sources."end-of-stream-1.4.4"
sources."extract-zip-2.0.1"
@@ -109165,7 +109194,7 @@ in
sources."progress-2.0.3"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."puppeteer-13.4.1"
+ sources."puppeteer-13.5.0"
sources."readable-stream-3.6.0"
sources."rimraf-3.0.2"
sources."robust-predicates-3.0.1"
@@ -109512,7 +109541,7 @@ in
sources."@types/node-17.0.21"
sources."@types/stack-utils-2.0.1"
sources."@types/yargs-16.0.4"
- sources."@types/yargs-parser-20.2.1"
+ sources."@types/yargs-parser-21.0.0"
sources."agent-base-6.0.2"
sources."ansi-align-3.0.1"
sources."ansi-regex-5.0.1"
@@ -109948,12 +109977,12 @@ in
sources."is-fullwidth-code-point-3.0.0"
sources."is-lambda-1.0.1"
sources."isexe-2.0.0"
- sources."lru-cache-7.4.0"
- sources."make-fetch-happen-10.0.3"
+ sources."lru-cache-7.4.1"
+ sources."make-fetch-happen-10.0.4"
sources."minimatch-3.1.2"
sources."minipass-3.1.6"
sources."minipass-collect-1.0.2"
- sources."minipass-fetch-1.4.1"
+ sources."minipass-fetch-2.0.2"
sources."minipass-flush-1.0.5"
sources."minipass-pipeline-1.2.4"
sources."minipass-sized-1.0.3"
@@ -111702,10 +111731,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "8.5.2";
+ version = "8.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-8.5.2.tgz";
- sha512 = "fQRPOSrQfO3AG1JEOgScVrYhOfprZbhSKAjY4goESGPKMflWHxyQt8djo6EZhNjxCNIUAPtT75hkCN902SeYAw==";
+ url = "https://registry.npmjs.org/npm/-/npm-8.5.3.tgz";
+ sha512 = "O+1j66Alx7ZQgWnUSSTaz8rTqQrJnqNb8Num5uQw2vYvc2RrxLaX7cWtRkDhvkPIL8Nf2WU9gx1oSu268QConA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -111720,10 +111749,10 @@ in
npm-check-updates = nodeEnv.buildNodePackage {
name = "npm-check-updates";
packageName = "npm-check-updates";
- version = "12.5.0";
+ version = "12.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.0.tgz";
- sha512 = "nrryXO9IZdJsAIXo8LdtllrsGiTDE4IMAod7fl1jd5C38tOdZZG/crNNii4IkctxltQRmK/ziZwsMDTlhszZXg==";
+ url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.2.tgz";
+ sha512 = "XJGFO3kgcm+WJljOPRYZf/W40FSzEcLDacQ1WPEgW4qXlQy4Ihr1eVnlS2+43y0YEF+qjLkycr7WbHyfkm6C4A==";
};
dependencies = [
sources."@gar/promisify-1.1.3"
@@ -111733,17 +111762,17 @@ in
sources."@npmcli/fs-1.1.1"
(sources."@npmcli/git-3.0.0" // {
dependencies = [
- sources."lru-cache-7.4.0"
+ sources."lru-cache-7.4.1"
];
})
sources."@npmcli/installed-package-contents-1.0.7"
sources."@npmcli/move-file-1.1.2"
sources."@npmcli/node-gyp-1.0.3"
sources."@npmcli/promise-spawn-1.3.2"
- sources."@npmcli/run-script-3.0.0"
+ sources."@npmcli/run-script-3.0.1"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@tootallnate/once-1.1.2"
+ sources."@tootallnate/once-2.0.0"
sources."abbrev-1.1.1"
sources."agent-base-6.0.2"
sources."agentkeepalive-4.2.1"
@@ -111835,7 +111864,7 @@ in
sources."has-yarn-2.1.0"
sources."hosted-git-info-4.1.0"
sources."http-cache-semantics-4.1.0"
- sources."http-proxy-agent-4.0.1"
+ sources."http-proxy-agent-5.0.0"
sources."https-proxy-agent-5.0.0"
sources."humanize-ms-1.2.1"
sources."iconv-lite-0.6.3"
@@ -111897,7 +111926,11 @@ in
sources."semver-6.3.0"
];
})
- sources."make-fetch-happen-9.1.0"
+ (sources."make-fetch-happen-10.0.4" // {
+ dependencies = [
+ sources."lru-cache-7.4.1"
+ ];
+ })
sources."merge2-1.4.1"
sources."micromatch-4.0.4"
sources."mimic-response-1.0.1"
@@ -111905,7 +111938,7 @@ in
sources."minimist-1.2.5"
sources."minipass-3.1.6"
sources."minipass-collect-1.0.2"
- sources."minipass-fetch-1.4.1"
+ sources."minipass-fetch-2.0.2"
sources."minipass-flush-1.0.5"
sources."minipass-json-stream-1.0.1"
sources."minipass-pipeline-1.2.4"
@@ -111914,7 +111947,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."negotiator-0.6.3"
- sources."node-gyp-8.4.1"
+ sources."node-gyp-9.0.0"
sources."nopt-5.0.0"
sources."normalize-package-data-3.0.3"
sources."normalize-url-4.5.1"
@@ -111924,14 +111957,7 @@ in
sources."npm-package-arg-9.0.0"
sources."npm-packlist-3.0.0"
sources."npm-pick-manifest-7.0.0"
- (sources."npm-registry-fetch-13.0.0" // {
- dependencies = [
- sources."@tootallnate/once-2.0.0"
- sources."http-proxy-agent-5.0.0"
- sources."lru-cache-7.4.0"
- sources."make-fetch-happen-10.0.3"
- ];
- })
+ sources."npm-registry-fetch-13.0.1"
sources."npmlog-6.0.1"
sources."once-1.4.0"
sources."p-cancelable-1.1.0"
@@ -112577,7 +112603,7 @@ in
sources."pako-1.0.11"
];
})
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
(sources."buffer-4.9.2" // {
dependencies = [
sources."isarray-1.0.0"
@@ -112594,7 +112620,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -112731,7 +112757,7 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -113456,11 +113482,11 @@ in
sources."ansi-styles-3.2.1"
sources."base-x-3.0.9"
sources."boolbase-1.0.0"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-from-1.1.2"
sources."callsites-3.1.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
(sources."chalk-4.1.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -113493,7 +113519,7 @@ in
sources."domutils-2.8.0"
sources."dotenv-7.0.0"
sources."dotenv-expand-5.1.0"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."entities-2.2.0"
sources."error-ex-1.3.2"
sources."escalade-3.1.1"
@@ -113516,7 +113542,7 @@ in
sources."json5-2.2.0"
sources."lilconfig-2.0.4"
sources."lines-and-columns-1.2.4"
- sources."lmdb-2.2.3"
+ sources."lmdb-2.2.4"
sources."lodash.memoize-4.1.2"
sources."lodash.uniq-4.5.0"
sources."mdn-data-2.0.14"
@@ -113536,7 +113562,7 @@ in
sources."parse-json-5.2.0"
sources."path-type-4.0.0"
sources."picocolors-1.0.0"
- sources."postcss-8.4.7"
+ sources."postcss-8.4.8"
sources."postcss-calc-8.2.4"
sources."postcss-colormin-5.3.0"
sources."postcss-convert-values-5.1.0"
@@ -115083,10 +115109,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "6.32.2";
+ version = "6.32.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.2.tgz";
- sha512 = "uPZDMVfB4SEygvfUJHBTNXUCrMCxkXV5QHaoEURCeHP5GDojKH21L1Onk2Qft+kYBmLCmipV3JCGfojSQV3epw==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.3.tgz";
+ sha512 = "lMQgROSwiUA+kt+suAPinjNwqevS1Iz0rppWNZ3jHhzeP07RFRQ+Ksai2OlAnM+YjlbHT9niQ4ICBVSqcdQ04w==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -115129,10 +115155,10 @@ in
postcss = nodeEnv.buildNodePackage {
name = "postcss";
packageName = "postcss";
- version = "8.4.7";
+ version = "8.4.8";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz";
- sha512 = "L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==";
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz";
+ sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==";
};
dependencies = [
sources."nanoid-3.3.1"
@@ -115333,6 +115359,39 @@ in
bypassCache = true;
reconstructLock = true;
};
+ prettier_d_slim = nodeEnv.buildNodePackage {
+ name = "prettier_d_slim";
+ packageName = "prettier_d_slim";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prettier_d_slim/-/prettier_d_slim-1.2.0.tgz";
+ sha512 = "Wq/Qida9MweJX7dKjlNeJ9Ppfeu4YPWY2947x1xev2RXjimvv2QOBRQJhGAir/QZ+WJnrU82e9O67Uqu8JgbZw==";
+ };
+ dependencies = [
+ sources."camelize-1.0.0"
+ sources."core_d-3.2.0"
+ sources."function-bind-1.1.1"
+ sources."has-1.0.3"
+ sources."has-flag-4.0.0"
+ sources."is-core-module-2.8.1"
+ sources."minimist-1.2.5"
+ sources."nanolru-1.0.0"
+ sources."path-parse-1.0.7"
+ sources."prettier-2.5.1"
+ sources."resolve-1.22.0"
+ sources."supports-color-8.1.1"
+ sources."supports-preserve-symlinks-flag-1.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Makes prettier fast";
+ homepage = "https://github.com/mikew/prettier_d_slim";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
prettier-plugin-toml = nodeEnv.buildNodePackage {
name = "prettier-plugin-toml";
packageName = "prettier-plugin-toml";
@@ -115907,10 +115966,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.226";
+ version = "1.1.227";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.226.tgz";
- sha512 = "ZJx3Kz5v7hc6DIeIVSC3zeCia43rlLD+IK8ip5k+h3gTlIQodaf/zccsCh2xmoBvCTY9VbbbLnDbkITyIW3+MA==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.227.tgz";
+ sha512 = "/nRQqbTpHraNiUZ0tpQfWYyqOV4nByx/rRHZp+wFjRv6v3Vfg1rIa973y9LsfH/vGkETbZMvRanb8VSlWp9Tlg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -116115,7 +116174,7 @@ in
sources."pako-0.2.9"
];
})
- sources."urijs-1.19.8"
+ sources."urijs-1.19.10"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."vlq-0.2.3"
@@ -116566,7 +116625,7 @@ in
];
})
sources."browserify-zlib-0.1.4"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-5.7.1"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
@@ -116600,7 +116659,7 @@ in
sources."camel-case-3.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."case-sensitive-paths-webpack-plugin-2.4.0"
sources."caw-2.0.1"
sources."chalk-2.4.2"
@@ -116828,7 +116887,7 @@ in
sources."duplexify-3.7.1"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -117065,7 +117124,7 @@ in
sources."http-cache-semantics-3.8.1"
sources."http-deceiver-1.2.7"
sources."http-errors-1.8.1"
- sources."http-parser-js-0.5.5"
+ sources."http-parser-js-0.5.6"
sources."http-proxy-1.18.1"
sources."http-proxy-middleware-0.19.1"
sources."https-browserify-1.0.0"
@@ -118997,10 +119056,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.69.0";
+ version = "2.70.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.69.0.tgz";
- sha512 = "kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.70.0.tgz";
+ sha512 = "iEzYw+syFxQ0X9RefVwhr8BA2TNJsTaX8L8dhyeyMECDbmiba+8UQzcu+xZdji0+JQ+s7kouQnw+9Oz5M19XKA==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -119050,7 +119109,7 @@ in
sources."@types/mocha-8.2.3"
sources."@types/node-14.17.34"
sources."@types/node-fetch-2.6.1"
- sources."@types/vscode-1.64.0"
+ sources."@types/vscode-1.65.0"
sources."@typescript-eslint/eslint-plugin-4.33.0"
sources."@typescript-eslint/experimental-utils-4.33.0"
sources."@typescript-eslint/parser-4.33.0"
@@ -119527,7 +119586,7 @@ in
sources."p-locate-5.0.0"
sources."path-exists-4.0.0"
sources."picocolors-1.0.0"
- sources."postcss-8.4.7"
+ sources."postcss-8.4.8"
sources."source-map-js-1.0.2"
sources."strip-json-comments-3.1.1"
sources."yocto-queue-0.1.0"
@@ -119879,7 +119938,7 @@ in
sources."async-3.2.3"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.1084.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -120950,10 +121009,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.859.0";
+ version = "1.864.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.859.0.tgz";
- sha512 = "myHCj1zbTV95ZfR+oVZRrOYJ65woMciR9tOVH+lVjZUs58kruH24bLiqxrd89BBLs+46PzowrOkFtJkdXNxuOg==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.864.0.tgz";
+ sha512 = "/RDg1P+uR0czvTZduVUoDvR7hhxi5bjqfp50ZBdRSL6pth2QG3jR6TQJ/GyJeIYpZkXQclU8jRRzg8L+MQG7zA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -121565,7 +121624,7 @@ in
];
})
sources."levelup-4.4.0"
- sources."libnested-1.5.1"
+ sources."libnested-1.5.2"
sources."libsodium-0.7.9"
sources."libsodium-wrappers-0.7.9"
sources."lodash.debounce-4.0.8"
@@ -121596,7 +121655,13 @@ in
sources."monotonic-timestamp-0.0.9"
sources."moo-0.5.1"
sources."ms-2.1.2"
- sources."multiblob-1.13.7"
+ (sources."multiblob-1.13.8" // {
+ dependencies = [
+ sources."glob-7.2.0"
+ sources."mkdirp-1.0.4"
+ sources."rimraf-3.0.2"
+ ];
+ })
sources."multiblob-http-1.2.1"
sources."multicb-1.2.2"
sources."multiserver-3.8.2"
@@ -121939,7 +122004,7 @@ in
];
})
sources."ssb-db-19.2.0"
- (sources."ssb-db2-2.8.10" // {
+ (sources."ssb-db2-2.8.11" // {
dependencies = [
sources."abstract-leveldown-6.2.3"
(sources."flumecodec-0.0.1" // {
@@ -121995,7 +122060,7 @@ in
sources."ssb-replicate-1.3.3"
sources."ssb-typescript-2.6.0"
sources."ssb-unix-socket-1.0.0"
- sources."ssb-uri2-1.7.1"
+ sources."ssb-uri2-1.7.2"
(sources."ssb-validate-4.1.4" // {
dependencies = [
sources."ssb-keys-8.2.0"
@@ -122207,7 +122272,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.1084.0" // {
+ (sources."aws-sdk-2.1087.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -123116,7 +123181,7 @@ in
sources."path-type-4.0.0"
sources."picocolors-1.0.0"
sources."picomatch-2.3.1"
- sources."postcss-8.4.7"
+ sources."postcss-8.4.8"
sources."postcss-media-query-parser-0.2.3"
sources."postcss-resolve-nested-selector-0.1.1"
sources."postcss-safe-parser-6.0.0"
@@ -123377,7 +123442,7 @@ in
sources."is-extglob-2.1.1"
sources."is-glob-4.0.3"
sources."is-number-7.0.0"
- sources."magic-string-0.25.7"
+ sources."magic-string-0.25.9"
sources."merge2-1.4.1"
sources."micromatch-4.0.4"
sources."min-indent-1.0.1"
@@ -123466,7 +123531,7 @@ in
sources."jsonc-parser-2.3.1"
sources."lodash-4.17.21"
sources."lower-case-2.0.2"
- sources."magic-string-0.25.7"
+ sources."magic-string-0.25.9"
sources."merge2-1.4.1"
sources."micromatch-4.0.4"
sources."min-indent-1.0.1"
@@ -124296,7 +124361,7 @@ in
sources."path-type-4.0.0"
sources."picocolors-1.0.0"
sources."picomatch-2.3.1"
- sources."postcss-8.4.7"
+ sources."postcss-8.4.8"
sources."postcss-js-4.0.0"
sources."postcss-load-config-3.1.3"
sources."postcss-nested-5.0.6"
@@ -128550,10 +128615,10 @@ in
three = nodeEnv.buildNodePackage {
name = "three";
packageName = "three";
- version = "0.138.2";
+ version = "0.138.3";
src = fetchurl {
- url = "https://registry.npmjs.org/three/-/three-0.138.2.tgz";
- sha512 = "l49+mdqpevKIk7ByLmt7cc5RdSwSnZ6rP1cLe8VCI/++c0/6AFYyHw6xjT2VyXYxodCnDSw7iARjKL2MlHVCOg==";
+ url = "https://registry.npmjs.org/three/-/three-0.138.3.tgz";
+ sha512 = "4t1cKC8gimNyJChJbaklg8W/qj3PpsLJUIFm5LIuAy/hVxxNm1ru2FGTSfbTSsuHmC/7ipsyuGKqrSAKLNtkzg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -129500,10 +129565,10 @@ in
sources."typedarray-0.0.6"
sources."unified-engine-9.0.5"
sources."unist-util-inspect-7.0.0"
- sources."unist-util-stringify-position-3.0.1"
+ sources."unist-util-stringify-position-3.0.2"
sources."util-deprecate-1.0.2"
- sources."vfile-5.3.1"
- sources."vfile-message-3.1.1"
+ sources."vfile-5.3.2"
+ sources."vfile-message-3.1.2"
(sources."vfile-reporter-7.0.3" // {
dependencies = [
sources."supports-color-9.2.1"
@@ -130286,7 +130351,7 @@ in
sources."@types/json-schema-7.0.9"
sources."@types/mocha-7.0.2"
sources."@types/node-8.10.66"
- sources."@types/vscode-1.64.0"
+ sources."@types/vscode-1.65.0"
sources."@types/yauzl-2.9.2"
sources."@ungap/promise-all-settled-1.1.2"
sources."@webassemblyjs/ast-1.11.1"
@@ -130326,12 +130391,12 @@ in
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."browser-stdout-1.3.1"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-crc32-0.2.13"
sources."buffer-from-1.1.2"
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
(sources."chalk-4.1.2" // {
dependencies = [
sources."supports-color-7.2.0"
@@ -130371,10 +130436,10 @@ in
sources."domelementtype-2.2.0"
sources."domhandler-4.3.0"
sources."domutils-2.8.0"
- sources."electron-to-chromium-1.4.75"
+ sources."electron-to-chromium-1.4.76"
sources."emoji-regex-8.0.0"
sources."emojis-list-3.0.0"
- sources."enhanced-resolve-5.9.1"
+ sources."enhanced-resolve-5.9.2"
sources."entities-2.2.0"
sources."envinfo-7.8.1"
sources."errno-0.1.8"
@@ -130581,7 +130646,7 @@ in
sources."vscode-debugadapter-testsupport-1.51.0"
sources."vscode-debugprotocol-1.51.0"
sources."watchpack-2.3.1"
- sources."webpack-5.69.1"
+ sources."webpack-5.70.0"
(sources."webpack-cli-4.9.2" // {
dependencies = [
sources."commander-7.2.0"
@@ -131757,7 +131822,7 @@ in
sources."unist-util-inspect-4.1.4"
sources."unist-util-is-2.1.3"
sources."unist-util-modify-children-1.1.6"
- sources."unist-util-stringify-position-3.0.1"
+ sources."unist-util-stringify-position-3.0.2"
sources."unist-util-visit-1.4.1"
(sources."unist-util-visit-parents-2.1.2" // {
dependencies = [
@@ -131789,7 +131854,7 @@ in
sources."vfile-message-2.0.4"
];
})
- sources."vfile-message-3.1.1"
+ sources."vfile-message-3.1.2"
(sources."vfile-reporter-6.0.2" // {
dependencies = [
sources."ansi-regex-5.0.1"
@@ -132624,10 +132689,10 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
- version = "5.69.1";
+ version = "5.70.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz";
- sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz";
+ sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==";
};
dependencies = [
sources."@types/eslint-8.4.1"
@@ -132656,13 +132721,13 @@ in
sources."acorn-import-assertions-1.8.0"
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
- sources."browserslist-4.19.3"
+ sources."browserslist-4.20.0"
sources."buffer-from-1.1.2"
- sources."caniuse-lite-1.0.30001312"
+ sources."caniuse-lite-1.0.30001313"
sources."chrome-trace-event-1.0.3"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.4.75"
- sources."enhanced-resolve-5.9.1"
+ sources."electron-to-chromium-1.4.76"
+ sources."enhanced-resolve-5.9.2"
sources."es-module-lexer-0.9.3"
sources."escalade-3.1.1"
sources."eslint-scope-5.1.1"
@@ -132913,7 +132978,7 @@ in
sources."html-entities-2.3.2"
sources."http-deceiver-1.2.7"
sources."http-errors-1.8.1"
- sources."http-parser-js-0.5.5"
+ sources."http-parser-js-0.5.6"
sources."http-proxy-1.18.1"
sources."http-proxy-middleware-2.0.3"
sources."human-signals-2.1.0"
@@ -133196,7 +133261,7 @@ in
sources."ms-2.1.2"
];
})
- (sources."bittorrent-tracker-9.18.3" // {
+ (sources."bittorrent-tracker-9.18.4" // {
dependencies = [
sources."debug-4.3.3"
sources."decompress-response-6.0.0"
@@ -133426,7 +133491,7 @@ in
sources."stream-to-blob-2.0.1"
sources."stream-to-blob-url-3.0.2"
sources."stream-with-known-length-to-buffer-1.0.4"
- sources."streamx-2.12.2"
+ sources."streamx-2.12.3"
sources."string-width-4.2.3"
sources."string2compact-1.3.2"
sources."string_decoder-1.3.0"
@@ -133437,7 +133502,7 @@ in
sources."thunky-0.1.0"
sources."timeout-refresh-1.0.3"
sources."to-arraybuffer-1.0.1"
- (sources."torrent-discovery-9.4.7" // {
+ (sources."torrent-discovery-9.4.9" // {
dependencies = [
sources."debug-4.3.3"
sources."ms-2.1.2"
@@ -133464,7 +133529,7 @@ in
sources."utp-native-2.5.3"
sources."videostream-3.2.2"
sources."vlc-command-1.2.0"
- (sources."webtorrent-1.8.3" // {
+ (sources."webtorrent-1.8.5" // {
dependencies = [
sources."debug-4.3.3"
sources."decompress-response-6.0.0"
@@ -133542,10 +133607,10 @@ in
yaml-language-server = nodeEnv.buildNodePackage {
name = "yaml-language-server";
packageName = "yaml-language-server";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.4.0.tgz";
- sha512 = "NgUzbSbRQvIH++P303a6Y20qLRqM8qhPESoJ/n26NBXA+GITozV1/JRl2FLEt9oPSR9WkQ1a9J3EsToHfKGQWA==";
+ url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.5.0.tgz";
+ sha512 = "tQA0M1HisyjoW6Y5beUlZ8x9Yil+pIMT4I1ox94erp9Jbm4ZHEPGxOD53TuA/e8CXxy8tX35vf/QqofnDr1/Gg==";
};
dependencies = [
sources."jsonc-parser-3.0.0"
@@ -134157,8 +134222,12 @@ in
sources."debug-4.3.3"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-5.0.0"
- sources."lru-cache-7.4.0"
- sources."make-fetch-happen-10.0.3"
+ sources."lru-cache-7.4.1"
+ (sources."make-fetch-happen-10.0.4" // {
+ dependencies = [
+ sources."minipass-fetch-2.0.2"
+ ];
+ })
sources."ms-2.1.2"
];
})
@@ -134645,7 +134714,7 @@ in
sources."micromatch-4.0.4"
sources."minimist-1.2.5"
sources."node-domexception-1.0.0"
- sources."node-fetch-3.2.1"
+ sources."node-fetch-3.2.2"
sources."path-type-4.0.0"
sources."pause-stream-0.0.11"
sources."picomatch-2.3.1"
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
index a75f05b33f..e5fe670213 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, cppo }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }:
buildDunePackage rec {
pname = "camomile";
@@ -23,6 +23,10 @@ buildDunePackage rec {
runHook postConfigure
'';
+ postInstall = ''
+ echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META
+ '';
+
meta = {
inherit (src.meta) homepage;
maintainers = [ lib.maintainers.vbgl ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix
index d3915b6593..d794e4acce 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
description = "OCaml binding for the fdk-aac library";
inherit (src.meta) homepage;
license = lib.licenses.gpl2Only;
- maintainers = [ lib.maintainers.vbgl ];
+ maintainers = [ lib.maintainers.vbgl lib.maintainers.dandellion ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix
new file mode 100644
index 0000000000..77a6ef01ac
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -0,0 +1,21 @@
+{ lib, fetchFromGitHub }:
+
+rec {
+ version = "1.1.0";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-ffmpeg";
+ rev = "v${version}";
+ sha256 = "13rc3d0n963a28my5ahv78r82rh450hvbsc74mb6ld0r9v210r0p";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-ffmpeg";
+ description = "Bindings for the ffmpeg libraries";
+ license = licenses.lgpl21Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix
new file mode 100644
index 0000000000..7f0a5da34d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildDunePackage, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil
+, ffmpeg-avcodec
+, ffmpeg-avfilter
+, ffmpeg-swscale
+, ffmpeg-swresample
+, ffmpeg-av
+, ffmpeg-avdevice
+}:
+
+buildDunePackage {
+ pname = "ffmpeg";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ propagatedBuildInputs = [
+ ffmpeg-avutil
+ ffmpeg-avcodec
+ ffmpeg-avfilter
+ ffmpeg-swscale
+ ffmpeg-swresample
+ ffmpeg-av
+ ffmpeg-avdevice
+ ];
+
+ # The tests fail
+ doCheck = false;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg libraries";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
new file mode 100644
index 0000000000..e8d71aa321
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }:
+
+buildDunePackage {
+ pname = "ffmpeg-av";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg libraries -- top-level helpers";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
new file mode 100644
index 0000000000..8ee5428c47
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-avcodec";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg avcodec library";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
new file mode 100644
index 0000000000..e6641a6ca0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-av, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-avdevice";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg avdevice library";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
new file mode 100644
index 0000000000..6479bbe55b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-avfilter";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg avfilter library";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
new file mode 100644
index 0000000000..121fb11514
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-avutil";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg avutil libraries";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
new file mode 100644
index 0000000000..92011e48ea
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-swresample";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg swresample library";
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
new file mode 100644
index 0000000000..9d97b72255
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, ffmpeg-base ? callPackage ./base.nix { }
+, ffmpeg-avutil, ffmpeg
+}:
+
+buildDunePackage {
+ pname = "ffmpeg-swscale";
+
+ minimalOCamlVersion = "4.08";
+
+ inherit (ffmpeg-base) version src useDune2;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
+
+ doCheck = true;
+
+ meta = ffmpeg-base.meta // {
+ description = "Bindings for the ffmpeg swscale library";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix
new file mode 100644
index 0000000000..e08841ac32
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }:
+
+buildDunePackage rec {
+ pname = "flac";
+ version = "0.3.0";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-flac";
+ rev = "v${version}";
+ sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ogg flac.dev ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-flac";
+ description = "Bindings for flac";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix
index 34b2ee668e..3dc4a9856f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix
@@ -6,11 +6,11 @@
buildDunePackage rec {
pname = "index";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchurl {
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
- sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f";
+ sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y";
};
minimalOCamlVersion = "4.08";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index 26deb2f059..4f192fe20e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -12,8 +12,8 @@
let params =
if lib.versionAtLeast ocaml.version "4.13"
then {
- version = "1.9.1";
- sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g";
+ version = "1.10.3";
+ sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE=";
} else if lib.versionAtLeast ocaml.version "4.12"
then {
version = "1.9.0";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix
new file mode 100644
index 0000000000..e1e1df6c2a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libogg }:
+
+buildDunePackage rec {
+ pname = "ogg";
+ version = "0.7.1";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-ogg";
+ rev = "v${version}";
+ sha256 = "0z3z0816rxq8wdjw51plzn8lmilic621ilk4x9wpnr0axmnl3wqb";
+ };
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ libogg ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-ogg";
+ description = "Bindings to libogg";
+ license = licenses.lgpl21Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix
new file mode 100644
index 0000000000..30e461b9f9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, libopus }:
+
+buildDunePackage rec {
+ pname = "opus";
+ version = "0.2.1";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-opus";
+ rev = "v${version}";
+ sha256 = "09mgnprhhs1adqm25c0qjhknswbh6va3jknq06fnp1jszszcjf4s";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ogg libopus.dev ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-opus";
+ description = "Bindings to libopus";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix
new file mode 100644
index 0000000000..3aa8cce798
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, shine }:
+
+buildDunePackage rec {
+ pname = "shine";
+ version = "0.2.2";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-shine";
+ rev = "2e1de686ea031f1056df389161ea2b721bfdb39e";
+ sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir";
+ };
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ shine ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-shine";
+ description = "Bindings to the fixed-point mp3 encoding library shine";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix
new file mode 100644
index 0000000000..1bf5f308ec
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, speex }:
+
+buildDunePackage rec {
+ pname = "speex";
+ version = "0.4.1";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-speex";
+ rev = "v${version}";
+ sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab";
+ };
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ogg speex.dev ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-speex";
+ description = "Bindings to libspeex";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix
index 1f4fd7b858..04f181d759 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix
@@ -24,6 +24,7 @@ buildDunePackage rec {
maintainers = [
lib.maintainers.maggesi
lib.maintainers.anmonteiro
+ lib.maintainers.dandellion
];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix
new file mode 100644
index 0000000000..0f7b4aca1c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libtheora }:
+
+buildDunePackage rec {
+ pname = "theora";
+ version = "0.4.0";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-theora";
+ rev = "v${version}";
+ sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal";
+ };
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ogg libtheora ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-theora";
+ description = "Bindings to libtheora";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix
new file mode 100644
index 0000000000..f33182e5fc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libvorbis }:
+
+buildDunePackage rec {
+ pname = "vorbis";
+ version = "0.8.0";
+
+ useDune2 = true;
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-vorbis";
+ rev = "v${version}";
+ sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8";
+ };
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ ogg libvorbis ];
+
+ meta = with lib; {
+ homepage = "https://github.com/savonet/ocaml-vorbis";
+ description = "Bindings to libvorbis";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix
index 0b2e5ff8c5..a8835241d0 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phing";
- version = "2.17.1";
+ version = "2.17.2";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://www.phing.info/get/phing-${version}.phar";
- sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE=";
+ sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
index bf1c806dfc..292d0b2ca0 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
- version = "3.6.0";
+ version = "3.7.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "sha256-sbz8uq6nJ6dEL6FHJ01VTrovaJa8bwQ9Ic+dLr7yPnA=";
+ sha256 = "sha256-a7mKM++0iQm9hQFCDfyR6Jdb9h98YNHmbdQso8BU3WE=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
index 9f8a5feb8a..41840f5ba9 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "phpstan";
- version = "1.4.7";
+ version = "1.4.8";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "sha256-bsSdFfUVQnbDFH8hO1Z9sHA2w7pMHlLEx1hsgDdCUmE=";
+ sha256 = "sha256-ghXyPo9n2oXAz7BvuvBYjyJnUqf/FvNk8nTPIRv19cw=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
index a9a5a007d9..5b7c02eefd 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psysh";
- version = "0.11.1";
+ version = "0.11.2";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
- sha256 = "sha256-OiEXI7AVcC5udISfJ41285OBL82mSd1Xb5qhVtG4p9I=";
+ sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg=";
};
dontUnpack = true;
@@ -26,6 +26,6 @@ mkDerivation {
description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP.";
license = licenses.mit;
homepage = "https://psysh.org/";
- maintainers = with maintainers; [ caugner ] ++ teams.php.members;
+ maintainers = teams.php.members;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 1ae1a31fa3..9ed55214b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.20.1";
+ version = "3.21.0";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-P5OWPsbRsTEMcvw7/uq0rj9p/4beVj/2OdWkllVMKMw=";
+ sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4=";
};
nativeBuildInputs = [
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 3101501f3c..b1938c88aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
- version = "0.7.15";
+ version = "0.7.16";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = version;
- sha256 = "sha256-na94H1ll9aZz/mQ4/y3b2vhSaOgo4OjtIsAfW6zGYyI=";
+ sha256 = "sha256-dakxPhnI1m6KiOj6oQkfQ0UVA7NEBTHFGYnF6L6c8Ck=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix
index 41847e5162..53bd099fce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix
@@ -1,18 +1,20 @@
{ lib
+, aiohttp
, buildPythonPackage
, fetchPypi
-, aiohttp
+, pythonOlder
}:
buildPythonPackage rec {
pname = "asyncsleepiq";
- version = "1.1.0";
-
+ version = "1.1.2";
format = "setuptools";
+ disabled = pythonOlder "3.7";
+
src = fetchPypi {
inherit pname version;
- sha256 = "93c944ff84fd23832b188320b10681a3b1caf935dd584cdd4e508a9bcc8fec1b";
+ sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY=";
};
propagatedBuildInputs = [
@@ -22,7 +24,9 @@ buildPythonPackage rec {
# upstream has no tests
doCheck = false;
- pythonImportsCheck = [ "asyncsleepiq" ];
+ pythonImportsCheck = [
+ "asyncsleepiq"
+ ];
meta = with lib; {
description = "Async interface to SleepIQ API";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 626a60d7c9..68cf99fa0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-rdbms";
- version = "10.0.0";
+ version = "10.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a";
+ sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
index 8d3bb5aca3..669ab37e4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
- version = "12.9.0";
+ version = "12.10.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225";
+ sha256 = "sha256-PH3CyT5/8qcxrNZqNqHwpiZgcrQVTeukiU2riRKF6jo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 421b46a994..c7c59fd2b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "azure-storage-file-share";
- version = "12.6.0";
+ version = "12.7.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7eb0cde00fbbb6b780da8bdd81312ab79de706c4a2601e4eded1bc430da680a8";
+ sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index b24417b325..5a83385b75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-synapse-artifacts";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa";
+ sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix
index 42203a43da..78529e288c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix
@@ -1,33 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
+, lark
, nose
, pythonOlder
}:
-let
- lark-parser = buildPythonPackage rec {
- pname = "lark-parser";
- version = "0.10.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2";
- };
-
- doCheck = true;
- };
-in
buildPythonPackage rec {
pname = "bc-python-hcl2";
- version = "0.3.30";
+ version = "0.3.33";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs=";
+ hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY=";
};
# Nose is required during build process, so can not use `checkInputs`.
@@ -36,7 +24,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- lark-parser
+ lark
];
# This fork of python-hcl2 doesn't ship tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix
index 1c491cb5de..aac2c2b973 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "blspy";
- version = "1.0.8";
+ version = "1.0.9";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso=";
+ hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
index b5679978c2..8743c01ba2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
@@ -9,13 +9,14 @@
buildPythonPackage rec {
pname = "canonicaljson";
- version = "1.5.0";
+ version = "1.6.0";
+ format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI=";
+ hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
index 4a00155a4e..754d7ca0f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.1.2";
+ version = "2.1.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
- sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d";
+ sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU=";
};
nativeBuildInputs = [
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 3991dc6bf6..6479933293 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "cftime";
- version = "1.5.2";
+ version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a";
+ sha256 = "sha256-ExA+ZlC+6mVSMWvVgl1qo7fpj1uBFQJt9IJnmN/590E=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch
deleted file mode 100644
index 9939e6fb43..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
- [[package]]
- name = "clvm_rs"
--version = "0.1.14"
-+version = "0.1.15"
- dependencies = [
- "bls12_381",
- "hex",
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix
index ec078970bc..7b5a5a96a8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix
@@ -5,35 +5,59 @@
, pythonOlder
, openssl
, perl
+, pkgs
}:
+let
+ # clvm-rs does not work with maturin 0.12
+ # https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711
+ maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec {
+ pname = "maturin";
+ version = "0.11.5";
+ src = fetchFromGitHub {
+ owner = "PyO3";
+ repo = "maturin";
+ rev = "v${version}";
+ hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA=";
+ };
+ cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c=";
+
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = lib.optionals stdenv.isLinux [ dbus ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ];
+
+ # Requires network access, fails in sandbox.
+ doCheck = false;
+ };
+in
+
buildPythonPackage rec {
pname = "clvm_rs";
- version = "0.1.15";
+ version = "0.1.19";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_rs";
rev = version;
- sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI=";
+ sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c=";
};
- patches = [
- # upstream forgot to refresh the lock file
- ./bump-cargo-lock.patch
- ];
-
cargoDeps = rustPlatform.fetchCargoTarball {
- inherit src patches;
+ inherit src;
name = "${pname}-${version}";
- sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk=";
+ sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE=";
};
format = "pyproject";
+ buildAndTestSubdir = "wheel";
+
nativeBuildInputs = [
perl # used by openssl-sys to configure
+ maturin_0_11
] ++ (with rustPlatform; [
cargoSetupHook
maturinBuildHook
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index c0863a5b39..d609508822 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "cmarkgfm";
- version = "0.7.0";
+ version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk=";
+ sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s=";
};
propagatedNativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix
new file mode 100644
index 0000000000..5ff53b8eb7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+, coqpit
+, fsspec
+, pytorch-bin
+
+, pytestCheckHook
+, soundfile
+, tensorboardx
+, torchvision
+}:
+
+let
+ pname = "coqui-trainer";
+ version = "0.0.4";
+in
+buildPythonPackage {
+ inherit pname version;
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "coqui-ai";
+ repo = "Trainer";
+ # https://github.com/coqui-ai/Trainer/issues/4
+ rev = "776eba829231543d3207927fc69b321d121e527c";
+ hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI=";
+ };
+
+ propagatedBuildInputs = [
+ coqpit
+ fsspec
+ pytorch-bin
+ soundfile
+ tensorboardx
+ ];
+
+ # tests are failing; tests require the clearml library
+ # https://github.com/coqui-ai/Trainer/issues/5
+ doCheck = false;
+
+ checkInputs = [
+ pytestCheckHook
+ torchvision
+ ];
+
+ pythonImportsCheck = [
+ "trainer"
+ ];
+
+ meta = with lib; {
+ description = "A general purpose model trainer, as flexible as it gets";
+ homepage = "https://github.com/coqui-ai/Trainer";
+ license = licenses.asl20;
+ maintainers = teams.tts.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
index a05c733521..f36a73fc27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "deezer-py";
- version = "1.3.6";
+ version = "1.3.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "a3ef151f7971d69769e7393f71373eaf896bccd22167213872ae46e04e14a2d7";
+ sha256 = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo=";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix
index 76579e4dd8..84a709ac53 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "emoji";
- version = "1.6.3";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "carpedm20";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0QOtsHGhqbjaEDpSbUXdE8+u6xzWbrTexx+BAeYwKa8=";
+ sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix
index 935eefa518..fcd65f1f31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
- version = "1.4.9";
+ version = "1.4.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0";
+ sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE=";
};
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
index 05963856ed..5861c66ca5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "google-cloud-access-context-manager";
- version = "0.1.9";
+ version = "0.1.10";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8";
+ sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index 67296f667a..c6f17c8d8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -7,15 +7,19 @@
, proto-plus
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-appengine-logging";
- version = "1.1.0";
+ version = "1.1.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd";
+ hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
index 7a138eb0b1..d28cdbf084 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
- version = "3.8.0";
+ version = "3.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig=";
+ sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
index 03022877a2..be13251d2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
- version = "2.7.1";
+ version = "2.7.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-NHjHzZm20jDdIg91Zr0ytM0V2sHAmZUF0hlD1C9DeSM=";
+ hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 35c082e056..2717af605e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -8,19 +8,33 @@
, pytest-asyncio
, pytz
, mock
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "3.6.0";
+ version = "3.6.1";
+ format = "setuptools";
+ disabled = pythonOlder "3.6";
+
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E=";
+ hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk=";
};
- propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
- checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+ propagatedBuildInputs = [
+ google-api-core
+ libcst
+ proto-plus
+ pytz
+ ];
+
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytest-asyncio
+ ];
pythonImportsCheck = [
"google.cloud.bigquery_datatransfer"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index 32988e35de..c26d7582c2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23";
+ sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 21fcf88e8f..a7ee6a7291 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.34.1";
+ version = "2.34.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-gzWuWmcSYeuBcFQpVUNwsLVGSF2+h4JulN4bIkUBWaM=";
+ sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 779fbb4e6e..9ffa885ab4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
- version = "2.6.0";
+ version = "2.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-z6qhLNPfZnFJE6CStAByqxHBv3Itfzn1FtxDE+JPci8=";
+ hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
index c99d5d0a8b..b66ff08cff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.10.5";
+ version = "2.10.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY=";
+ sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index a095b9a04f..c3e748810e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
- version = "3.7.0";
+ version = "3.7.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-5ehghcpPZTlw8dOJ74pkB4k0g79wHLh+zj3fLCOR4Rc=";
+ hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 66cca84e9c..d8451ec097 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-dataproc";
- version = "4.0.0";
+ version = "4.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-x4ejr6qj5z4yKOx0pIqK13oVzsKj+uQ43Q5VN48jaFQ=";
+ sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c=";
};
- propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+ propagatedBuildInputs = [
+ google-api-core
+ libcst
+ proto-plus
+ ];
- checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytest-asyncio
+ ];
disabledTests = [
# requires credentials
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 30cf1ae31a..d2afea058d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4OwOEb+E+doiQ+gm3f4O+O88PXwFWINfTpRvOlzMuCA=";
+ sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 90e2298578..1961789e3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
- version = "3.6.1";
+ version = "3.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-zDGLdyBvm2haNaWRanHkRJZqHl+yvBuHRxCGqXYO7Ow=";
+ hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 06c4d9e236..9c5af01714 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-error-reporting";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk=";
+ sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
index 50a08e66f3..bc22afe461 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
- version = "2.3.4";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw=";
+ sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 47ca59ab2a..017634fd52 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -7,15 +7,19 @@
, proto-plus
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
- version = "1.0.0";
+ version = "1.0.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137";
+ hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
index c0130e506a..26c89af2ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "google-cloud-iam";
- version = "2.6.0";
+ version = "2.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-iLfXzZ3LCNlkgsMilf8TW5ZXgdSBWRgJtuL8zIpUlns=";
+ sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
index 063ba06660..24afcea7a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M=";
+ sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk=";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
index 1efbcf02de..6317d621a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
- version = "2.11.0";
+ version = "2.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ=";
+ sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
};
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
index c8adfc5446..c4caa9474e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-language";
- version = "2.4.0";
+ version = "2.4.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE=";
+ sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk=";
};
- propagatedBuildInputs = [ google-api-core libcst proto-plus ];
+ propagatedBuildInputs = [
+ google-api-core
+ libcst
+ proto-plus
+ ];
- checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+ checkInputs = [
+ mock
+ pytestCheckHook
+ pytest-asyncio
+ ];
pythonImportsCheck = [
"google.cloud.language"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index 9a4a6a83d4..32572b0115 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
- version = "2.9.0";
+ version = "2.9.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-6Xu07QBrVGQOwxi65KZaYFKF3DJ/1uc+zC+NUKqJeWM=";
+ hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index f30c3f35aa..2e698db4ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is=";
+ sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU=";
};
propagatedBuildInputs = [ google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 1756aad3d8..6f6223f1be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1emoPnXxKRLzMQe+/ojTGvt2sYQJLSwu6N3C06p0T00=";
+ sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 67a8daf6f9..5f9fdb2833 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
- version = "2.9.0";
+ version = "2.11.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "2b3d9336afab0e5df67201234976519a28da3ccb7c9a0e463be28e2827a9fdaa";
+ sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
index ef76b37835..fc1ca31212 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
- version = "2.7.0";
+ version = "2.7.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-i3jgEaAJ0zEaJWtpzhOe23CtpUpt1ON4gXnVvSG8fTI=";
+ hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index e35349d8e8..da5d110225 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
- version = "1.4.0";
+ version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-InkkAtqK5f1oqUK0Nsxc2PYt5JWBlB3ElGVNs5IJV/Q=";
+ hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index 6782e30e78..e3c3e05ac1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-G2vyhj2pbNywGE2/QTyNviYQOcsAj4KR8vIcGhvM5e8=";
+ sha256 = "sha256-apn1ex/2VX18GHgN5+JYurzTKMqzPTNqTNOAI+DEBLw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index d49eb3cf33..056c57ecd5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
- version = "1.9.0";
+ version = "1.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-qtaZs6mgcYeEEdf6KGQNx7c+RP8SqSNyTCZuhTVAq38=";
+ hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
index 097da84210..e461b4cdcb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.13.0";
+ version = "2.13.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-NO2oxVszbm2KYiN2NCn3edIyBx+E++sttJTgZd/yXzQ=";
+ hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 341990868e..881f00ead5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/iEexbBw/lBhD+7BawaYHQpDB98jxqJB4hkmUaFHJN8=";
+ sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10=";
};
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 4e52f5f3fd..73c09e61c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
- version = "2.10.1";
+ version = "2.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-5uFtHqZJgouUBgkGNqSBFQrWaU2Gm06icDjKx57HY94=";
+ sha256 = "sha256-EykIDxoO8ePp4hLtINTz/RahfS4KU7GhwS4gkMBA32w=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
index 6c17d6cb99..bb9eb5f477 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ=";
+ sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
index c3008caaf6..c36bd09ba7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
- version = "3.7.1";
+ version = "3.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y=";
+ hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index 629220fe37..5836869352 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4=";
+ sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c=";
};
propagatedBuildInputs = [ google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
index 312d8ec3b1..61c383dca6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
- version = "2.7.0";
+ version = "2.7.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-antpKF6egHtya4g9sKuQLQepz1QRLQ6LiCdpfYBsDh8=";
+ hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index c7730e5138..2ea8de6f13 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ=";
+ sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix
index ac40e44653..acf2e734f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
- version = "1.7.1";
+ version = "1.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
- sha256 = "sha256-c/Btc2CiYGb9ZGzNYDd1xJoGID6amTyv/Emdh1M6e/U=";
+ sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
index 0b81aa71eb..6aca35ae9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-H02LFRlnZv34qGD9LPqmGEE4cH7F+SHNGDQGel39Lbc=";
+ sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix
index 6fbefe827b..531ead0f19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeclimate";
- version = "1.0.3";
+ version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = "v${version}";
- hash = "sha256-z8X/AZx5Vam7nqYTjhhyXz7E23Crf5vLlNhWXLGSMcs=";
+ hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
index c1baa8a3ca..515d6ed8d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "0.36.0";
+ version = "0.36.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-yBkWBIT+FsOk9g3NgBTI3q4hN/dL6gI5UkoZnRcS3Jw=";
+ sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix
index ef7e5b8755..71aad2650f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "herepy";
- version = "3.5.6";
+ version = "3.5.7";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "abdullahselek";
repo = "HerePy";
rev = version;
- sha256 = "sha256-I5u5PKB29jQNFdsx+y5ZJOE837D7Hpcsf3pwlCvmEqU=";
+ hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix
index c89517f189..329d7a77df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
- version = "0.9.10";
+ version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = version;
- hash = "sha256-eXXcPowLbIsjPXul2Un0LTBPLbDhpEqfUg7pPR22NHM=";
+ hash = "sha256-lQV5KpASbrz+wCi9x/0rNYrQE+dLCZzsNBFhYAQvPH4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix
index 3504c6bf32..7e6b00429d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix
@@ -24,50 +24,73 @@
, flatbuffers
, isPy39
, lib
+, python
, scipy
, stdenv
# Options:
, cudaSupport ? config.cudaSupport or false
}:
-# Note that these values are tied to the specific version of the GPU wheel that
-# we fetch. When updating, try to go for the latest possible versions that are
-# still compatible with the cudatoolkit and cudnn versions available in nixpkgs.
+# There are no jaxlib wheels targeting cudnn <8.0.5, and although there are
+# wheels for cudatoolkit <11.1, we don't support them.
assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1";
assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5";
let
- device = if cudaSupport then "gpu" else "cpu";
+ version = "0.3.0";
+
+ pythonVersion = python.pythonVersion;
+
+ # Find new releases at https://storage.googleapis.com/jax-releases. When
+ # upgrading, you can get these hashes from prefetch.sh.
+ cpuSrcs = {
+ "3.9" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl";
+ hash = "sha256-AfBVqoqChEXlEC5PgbtQ5rQzcbwo558fjqCjSPEmN5Q=";
+ };
+ "3.10" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl";
+ hash = "sha256-9uBkFOO8LlRpO6AP+S8XK9/d2yRdyHxQGlbAjShqHRQ=";
+ };
+ };
+
+ gpuSrcs = {
+ "3.9-805" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl";
+ hash = "sha256-CArIhzM5FrQi3TkdqpUqCeDQYyDMVXlzKFgjNXjLJXw=";
+ };
+ "3.9-82" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl";
+ hash = "sha256-Q0plVnA9pUNQ+gCHSXiLNs4i24xCg8gBGfgfYe3bot4=";
+ };
+ "3.10-805" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl";
+ hash = "sha256-JopevCEAs0hgDngIId6NqbLam5YfcS8Lr9cEffBKp1U=";
+ };
+ "3.10-82" = fetchurl {
+ url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl";
+ hash = "sha256-2f5TwbdP7EfQNRM3ZcJXCAkS2VXBwNYH6gwT9pdu3Go=";
+ };
+ };
in
buildPythonPackage rec {
pname = "jaxlib";
- version = "0.3.0";
+ inherit version;
format = "wheel";
- # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting
- # all of them is a pain, so we focus on 3.9, the current nixpkgs python3
- # version.
- disabled = !isPy39;
+ # At the time of writing (2022-03-03), there are releases for <=3.10.
+ # Supporting all of them is a pain, so we focus on 3.9, the current nixpkgs
+ # python3 version, and 3.10.
+ disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10");
- # Find new releases at https://storage.googleapis.com/jax-releases.
- src = {
- cpu = fetchurl {
- url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl";
- sha256 = "151p4vqli8x0iqgrzrr8piqk7d76a2xq2krf23jlb142iam5bw01";
- };
- gpu = fetchurl {
- # Note that there's also a release targeting cuDNN 8.2, but unfortunately
- # we don't yet have that packaged at the time of writing (02/03/2022).
- # Check pkgs/development/libraries/science/math/cudnn/default.nix for more
- # details.
- url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl";
- sha256 = "0z15rdw3a8sq51rpjmfc41ix1q095aasl79rvlib85ir6f3wh2h8";
-
- # This is what the cuDNN 8.2 download looks like for future reference:
- # url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl";
- # sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb";
- };
- }.${device};
+ src =
+ if !cudaSupport then cpuSrcs."${pythonVersion}" else
+ let
+ # jaxlib wheels are currently provided for cudnn versions at least 8.0.5 and
+ # 8.2. Try to use 8.2 whenever possible.
+ cudnnVersion = if (lib.versionAtLeast cudnn.version "8.2") then "82" else "805";
+ in
+ gpuSrcs."${pythonVersion}-${cudnnVersion}";
# Prebuilt wheels are dynamically linked against things that nix can't find.
# Run `autoPatchelfHook` to automagically fix them.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh
new file mode 100755
index 0000000000..31db653063
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh
@@ -0,0 +1,7 @@
+version="$1"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)"
+nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
index ba70918cde..9722497c75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.18.3";
+ version = "1.18.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-OMFW2xR6X/6H8ouHAe5qX8ltuwkNG9esjdosac+MiNw=";
+ sha256 = "sha256-rsD8euVGf1nbIHnDyxbyW7LJWtUSsc4Uf3c5OmgYpMY=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix
new file mode 100644
index 0000000000..0ceced85ca
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "kiss-headers";
+ version = "2.3.0";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "Ousret";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ=";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs"
+ '';
+
+ disabledTestPaths = [
+ # Tests require internet access
+ "kiss_headers/__init__.py"
+ "tests/test_serializer.py"
+ "tests/test_with_http_request.py"
+ ];
+
+ pythonImportsCheck = [ "kiss_headers" ];
+
+ meta = with lib; {
+ description = "Python package for HTTP/1.1 style headers";
+ homepage = "https://github.com/Ousret/kiss-headers";
+ license = licenses.mit;
+ maintainers = with maintainers; [ wolfangaukang ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
index bb39b29c0d..be4f4aad56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "kombu";
- version = "5.2.3";
+ version = "5.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270=";
+ hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix
index 83ff792a62..6dac34a9f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "losant-rest";
- version = "1.15.2";
+ version = "1.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
- sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM=";
+ sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix
index 681ef649d8..b2099e162d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lupa/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "lupa";
- version = "1.10";
+ version = "1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE=";
+ sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4=";
};
nativeBuildInputs = [ cython ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix
index 2fd61bc5a3..9a7c834c0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "1.2.88";
+ version = "1.2.90";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
- sha256 = "sha256-iNDS1QjlDiXb89g7Gut+5ShbgtCCHBSJuQmXfHaTXB8=";
+ sha256 = "sha256-n/M1Q6YS3EkUcn45ffiTy0wuj9yKf6qBLLfD2XJkhHU=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix
index 345a77239b..ab814061b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nextcord";
- version = "2.0.0a8";
+ version = "2.0.0a9";
format = "setuptools";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "nextcord";
repo = "nextcord";
rev = version;
- hash = "sha256-aYFY58zWZlZwW3xwa1iAK4w29AofKIkTyCjQ2nR8JrY=";
+ hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix
index f8ba8d3cf2..d70fa2826d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix
@@ -1,25 +1,43 @@
{ lib
, buildPythonPackage
+, cffi
, fetchPypi
-, zope_interface, cffi
-, sphinx, manuel
+, zope_interface
+, sphinx
+, manuel
+, pythonOlder
}:
buildPythonPackage rec {
pname = "persistent";
- version = "4.7.0";
+ version = "4.8.0";
+ format = "setuptools";
- nativeBuildInputs = [ sphinx manuel ];
- propagatedBuildInputs = [ zope_interface cffi ];
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333";
+ hash = "sha256-nRd+rT+jwfXWKjbUUmdUs3bgUEx9S3XLmqUvt3HexrI=";
};
- meta = {
+ nativeBuildInputs = [
+ sphinx
+ manuel
+ ];
+
+ propagatedBuildInputs = [
+ zope_interface
+ cffi
+ ];
+
+ pythonImportsCheck = [
+ "persistent"
+ ];
+
+ meta = with lib; {
description = "Automatic persistence for Python objects";
- homepage = "http://www.zodb.org/";
- license = lib.licenses.zpl21;
+ homepage = "https://github.com/zopefoundation/persistent/";
+ license = licenses.zpl21;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index 57b085a540..c1df3ce275 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -1,6 +1,8 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
+# for passthru.tests
+, imageio, matplotlib, pilkit, pydicom, reportlab
}@args:
import ./generic.nix (rec {
@@ -14,6 +16,10 @@ import ./generic.nix (rec {
sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf";
};
+ passthru.tests = {
+ inherit imageio matplotlib pilkit pydicom reportlab;
+ };
+
meta = with lib; {
homepage = "https://python-pillow.org/";
description = "The friendly PIL fork (Python Imaging Library)";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
index 3e33f1a8aa..97c67fd5fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix
@@ -3,13 +3,14 @@
, disabled
, src
, meta
+, passthru ? {}
, ...
}@args:
with args;
buildPythonPackage rec {
- inherit pname version src meta;
+ inherit pname version src meta passthru;
# Disable imagefont tests, because they don't work well with infinality:
# https://github.com/python-pillow/Pillow/issues/1259
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
index 16bcd15a1b..83c697aa7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
- version = "9.0.0";
+ version = "9.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-jZRfJVBSUOrfaPx8yGCwigfDghUgO0dK8aUKrOf9G1E=";
+ hash = "sha256-jvg/2dL+W4N7rbbBcIUZUrSt0BCV15k4QgYST2lEA5U=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix
index 94cfaaa78c..4e05dd51b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix
@@ -13,12 +13,12 @@
}: buildPythonPackage rec
{
pname = "psygnal";
- version = "0.3.0";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "tlambert03";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vrGym/V0cSGIjBWMWpDrPBijEOFayK1vdR02gsWzRvo=";
+ sha256 = "sha256-BQmcA1gD2i4sxROH+a7gStcNK1mXYVerIZ2y6gn8vI8=";
};
buildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ typing-extensions ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
index c24bcefec1..c9db28324e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyathena";
- version = "2.4.1";
+ version = "2.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyAthena";
inherit version;
- sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b";
+ sha256 = "sha256-2Z0KjJm6cWhMTKXa2zBs3Ef2i/e1tqQYZx5sSKIT9a4=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix
new file mode 100644
index 0000000000..f286e6b45b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, assertpy
+, buildPythonPackage
+, fetchFromGitHub
+, lark
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, regex
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+ pname = "pycep-parser";
+ version = "0.3.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "gruebel";
+ repo = "pycep";
+ rev = version;
+ hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ lark
+ regex
+ typing-extensions
+ ];
+
+ checkInputs = [
+ assertpy
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \
+ --replace 'regex = "^2022.3.2"' 'regex = "*"'
+ '';
+
+ pythonImportsCheck = [
+ "pycep"
+ ];
+
+ meta = with lib; {
+ description = "Python based Bicep parser";
+ homepage = "https://github.com/gruebel/pycep";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix
index 3d9b418817..50e04ef201 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix
@@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "pydroid-ipcam";
- version = "unstable-2021-06-01";
+ version = "1.3.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1";
- sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s";
+ hash = "sha256-ekgYzTf8it94OYVGcJhEzVFv+9tCrdfLgyco7wq9AXE=";
};
propagatedBuildInputs = [
@@ -25,7 +27,10 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "pydroid_ipcam" ];
+
+ pythonImportsCheck = [
+ "pydroid_ipcam"
+ ];
meta = with lib; {
description = "Python library for Android IP Webcam";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylru/default.nix
index 8ca565834d..a83f2fd3ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylru/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylru/default.nix
@@ -1,18 +1,35 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "pylru";
- version = "1.2.0";
+ version = "1.2.1";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "jlhutch";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE=";
};
+ # Check with the next release if tests are ready
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pylru"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/jlhutch/pylru";
description = "A least recently used (LRU) cache implementation";
- license = licenses.gpl2;
+ homepage = "https://github.com/jlhutch/pylru";
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ abbradar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
index 6f846481b0..8bf43a4454 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymavlink";
- version = "2.4.20";
+ version = "2.4.27";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QdYlmlDZzVH8tErGdgAz6FjT/L7jexduvrffKVEqMfY=";
+ sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY=";
};
propagatedBuildInputs = [ future lxml ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
index 5cf2615ed0..7c1e46647e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
@@ -2,10 +2,11 @@
, fetchPypi
, buildPythonPackage
, pythonOlder
-, Theano
+, theano-pymc
, pandas
, patsy
, joblib
+, cachetools
, tqdm
, six
, h5py
@@ -16,6 +17,8 @@
, parameterized
, fastprogress
, typing-extensions
+, dill
+, semver
}:
buildPythonPackage rec {
@@ -34,7 +37,6 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
- Theano
pandas
patsy
joblib
@@ -45,12 +47,10 @@ buildPythonPackage rec {
packaging
fastprogress
typing-extensions
- ];
-
- checkInputs = [
- pytest
- nose
- parameterized
+ dill
+ theano-pymc
+ cachetools
+ semver
];
# The test suite is computationally intensive and test failures are not
@@ -67,9 +67,6 @@ buildPythonPackage rec {
description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
homepage = "https://github.com/pymc-devs/pymc3";
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ ilya-kolpakov ];
- # several dependencies are not declared and in the end it requires theano-pymc3
- # instead of Theano. The former is currently not packaged.
- broken = true;
+ maintainers = with lib.maintainers; [ nidabdella ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
index ad862feaf5..24c214fcba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pymupdf";
- version = "1.19.5";
+ version = "1.19.6";
src = fetchPypi {
pname = "PyMuPDF";
inherit version;
- sha256 = "sha256-OTybnLJmmoaRoBew/bmuDs86Smbypc6jfQqqGikKVaU=";
+ sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix
index 9f2c457bc7..7c278d6e1b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy mpi4py precice ];
doCheck = false; # Disable Test because everything depends on open mpi which requires network.
- pythonImportChecks = [ "precice" ];
+ # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
meta = with lib; {
description = "Python language bindings for preCICE";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix
index e4417139bf..843f140ce7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "pytenable";
- version = "1.4.3";
+ version = "1.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "tenable";
repo = "pyTenable";
rev = version;
- hash = "sha256-p9d3wZkOMhNQWJN6tCNUlW15A3irU8QN/nm7PLGTE/M=";
+ hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
index 4095ff9285..c1391995dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "python-miio";
- version = "0.5.10";
+ version = "0.5.11";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-6iV+uIdVi0Z3FeM9xnp1Ss3VzFVEOm7wykxjSTXUIGM=";
+ sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c=";
};
nativeBuildInputs = [
@@ -70,10 +70,6 @@ buildPythonPackage rec {
"miio"
];
- disabledTestPaths = [
- "miio/tests/test_vacuums.py"
- ];
-
meta = with lib; {
description = "Python library for interfacing with Xiaomi smart appliances";
homepage = "https://github.com/rytilahti/python-miio";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix
index 05efc97b64..8c76861bcb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "python-openstackclient";
- version = "5.7.0";
+ version = "5.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92";
+ sha256 = "sha256-M0hS34iXuV8FgewS7ih96MepKJogihjwqLOHdwGf2YY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix
new file mode 100644
index 0000000000..04e89b664c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix
@@ -0,0 +1,42 @@
+{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "python-zbar";
+ version = "0.23.90";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "mchehab";
+ repo = "zbar";
+ rev = version;
+ sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U=";
+ };
+
+ propagatedBuildInputs = [ pillow ];
+
+ buildInputs = [ zbar ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ preBuild = ''
+ cd python
+ '';
+
+ disabledTests = [
+ #AssertionError: b'Y800' != 'Y800'
+ "test_format"
+ "test_new"
+ #Requires loading a recording device
+ #zbar.SystemError:
+ "test_processing"
+ ];
+
+ pythonImportsCheck = [ "zbar" ];
+
+ meta = with lib; {
+ description = "Python bindings for zbar";
+ homepage = "https://github.com/mchehab/zbar";
+ license = licenses.lgpl21Only;
+ maintainers = with maintainers; [ wolfangaukang ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
index 6fb7d5d472..64b3d11e95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pyturbojpeg";
- version = "1.6.5";
+ version = "1.6.6";
format = "setuptools";
src = fetchPypi {
pname = "PyTurboJPEG";
inherit version;
- hash = "sha256-l3eeD/WGiqVQ2E92WBV8eTRPVdtUnP7wP4brE8PPTkw=";
+ hash = "sha256-gN0VNISogw2rTr58DuHLQ8VyOg6VE3X9T/j6fw0EdXw=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix
deleted file mode 100644
index 9777f33313..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, aiohttp
-, python-dateutil
-, requests
-, websockets
-}:
-
-buildPythonPackage rec {
- pname = "pytwitchapi";
- version = "2.5.2";
- format = "setuptools";
-
- disabled = pythonOlder "3.7";
-
- src = fetchFromGitHub {
- owner = "Teekeks";
- repo = "pyTwitchAPI";
- rev = "v${version}";
- hash = "sha256-i+oAx23bMu+jaXHPWElD5GJH6vSytW/9N1amsmma4Lc=";
- };
-
- propagatedBuildInputs = [
- aiohttp
- python-dateutil
- requests
- websockets
- ];
-
- # Project has no tests.
- doCheck = false;
-
- pythonImportsCheck = [
- "twitchAPI"
- ];
-
- meta = with lib; {
- description = "Python implementation of the Twitch Helix API, its Webhook and PubSub";
- homepage = "https://github.com/Teekeks/pyTwitchAPI";
- license = licenses.mit;
- maintainers = with maintainers; [ wolfangaukang ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix
index 6c2bba30ea..c5b4413540 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "radios";
- version = "0.1.0";
+ version = "0.1.1";
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-radios";
rev = "v${version}";
- hash = "sha256-3xRtOGY9DYnZN0g95213vWDbO3/XZZ5+s7A9sqNmO/w=";
+ hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
index 65ab0cb268..b7709da9dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "readme-renderer";
- version = "32.0";
+ version = "33.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "readme_renderer";
inherit version;
- sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U=";
+ sha256 = "sha256-47U7yEvWrwVOTMH+NWfcGuGfVUE0IhBDo/jGdOIiCds=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
index 06631fe6c5..b4bebb79a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "samsungtvws";
- version = "2.1.0";
+ version = "2.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-b6nlOJgrlUDgsjYzr2nOntPTRWIjh4JUWP+UzsdiqgU=";
+ sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
index 660ca5de80..63c24e9936 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
@@ -13,6 +13,7 @@
, pytest-sugar
, pytestCheckHook
, pythonOlder
+, pythonAtLeast
, sanic-routing
, sanic-testing
, ujson
@@ -26,7 +27,8 @@ buildPythonPackage rec {
version = "21.12.1";
format = "setuptools";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.7" ||
+ pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
src = fetchFromGitHub {
owner = "sanic-org";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix
index 69b9bf0546..fcf1650346 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "scikit-survival";
- version = "0.17.0";
+ version = "0.17.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ba49325f6a31e8bdccfb88337aa85218d209e88a6a704e9c41ef13bf749e0f46";
+ sha256 = "sha256-Sx+reZKBbahjkVgo8hC8EP5vMsRhnprwGjKumQqH83k=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/third_party/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch
new file mode 100644
index 0000000000..4c6f869c0c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch
@@ -0,0 +1,21 @@
+From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001
+From: "P. R. d. O"
+Date: Mon, 6 Dec 2021 15:26:19 -0600
+Subject: [PATCH] set poetry-core
+
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index d3fdc52..bd7ddc2 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -27,4 +27,4 @@ black = "^19.10b0"
+
+ [build-system]
+ requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++build-backend = "poetry.core.masonry.api"
+--
+2.33.1
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix
new file mode 100644
index 0000000000..39cd92f5f6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "single-version";
+ version = "1.5.1";
+ format = "pyproject";
+
+ src = fetchFromGitHub {
+ owner = "hongquan";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10=";
+ };
+
+ patches = [
+ ./0001-set-poetry-core.patch
+ ];
+
+ nativeBuildInputs = [ poetry-core ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "single_version" ];
+
+ meta = with lib; {
+ description = "Utility to let you have a single source of version in your code base";
+ homepage = "https://github.com/hongquan/single-version";
+ license = licenses.mit;
+ maintainers = with maintainers; [ wolfangaukang ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix
index 9a1d614062..c1b68e6108 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix
@@ -1,7 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, fetchpatch
+, pytestCheckHook
, numpy
, libsndfile
, cffi
@@ -12,6 +13,8 @@
buildPythonPackage rec {
pname = "soundfile";
version = "0.10.3.post1";
+ # https://github.com/bastibe/python-soundfile/issues/157
+ disabled = isPyPy || stdenv.isi686;
src = fetchPypi {
pname = "SoundFile";
@@ -19,22 +22,30 @@ buildPythonPackage rec {
sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329";
};
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ numpy libsndfile cffi ];
- propagatedNativeBuildInputs = [ cffi ];
+ patches = [
+ # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332
+ (fetchpatch {
+ url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch";
+ sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU=";
+ })
+ ];
- meta = {
- description = "An audio library based on libsndfile, CFFI and NumPy";
- license = lib.licenses.bsd3;
- homepage = "https://github.com/bastibe/PySoundFile";
- maintainers = with lib.maintainers; [ fridh ];
- };
+ postPatch = ''
+ substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"
+ '';
- postPatch = ''
- substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"
- '';
+ checkInputs = [ pytestCheckHook ];
+ propagatedBuildInputs = [ numpy libsndfile cffi ];
+ propagatedNativeBuildInputs = [ cffi ];
- # https://github.com/bastibe/PySoundFile/issues/157
- disabled = isPyPy || stdenv.isi686;
+ # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see
+ # https://github.com/bastibe/python-soundfile/issues/331
+ doCheck = stdenv.system != "aarch64-darwin";
+ meta = {
+ description = "An audio library based on libsndfile, CFFI and NumPy";
+ license = lib.licenses.bsd3;
+ homepage = "https://github.com/bastibe/python-soundfile";
+ maintainers = with lib.maintainers; [ fridh ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix
index f77ee113bb..8b68eea256 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "sphinxext-opengraph";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "wpilibsuite";
repo = "sphinxext-opengraph";
rev = "v${version}";
- sha256 = "sha256-kaKOKeztP89SLF4yrUFW1TTAEyAaCTm2XCcOH0b+Dzc=";
+ sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI=";
};
propagatedBuildInputs = [
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 4757cd3231..f627f0e723 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
@@ -7,19 +7,21 @@
, pytest
, pytest-cov
, hypothesis
-, isPy3k
+, pythonOlder
}:
buildPythonPackage rec {
pname = "stups-pierone";
- version = "1.1.49";
- disabled = !isPy3k;
+ version = "1.1.50";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zalando-stups";
repo = "pierone-cli";
rev = version;
- sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q";
+ hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw=";
};
propagatedBuildInputs = [
@@ -28,9 +30,9 @@ buildPythonPackage rec {
stups-zign
];
- preCheck = "
+ preCheck = ''
export HOME=$TEMPDIR
- ";
+ '';
checkInputs = [
pytest
@@ -38,10 +40,14 @@ buildPythonPackage rec {
hypothesis
];
+ pythonImportsCheck = [
+ "pierone"
+ ];
+
meta = with lib; {
description = "Convenient command line client for STUPS' Pier One Docker registry";
homepage = "https://github.com/zalando-stups/pierone-cli";
license = licenses.asl20;
- maintainers = [ maintainers.mschuwalow ];
+ maintainers = with maintainers; [ mschuwalow ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix
new file mode 100644
index 0000000000..ad0b93fe09
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pythonOlder
+, pandas
+, numpy
+, scipy
+, filelock
+, pytest
+, nose
+, parameterized
+}:
+
+buildPythonPackage rec {
+ pname = "theano-pymc";
+ version = "1.1.2";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ pname = "Theano-PyMC";
+ inherit version;
+ sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc";
+ };
+
+ # No need for coverage stats in Nix builds
+ postPatch = ''
+ substituteInPlace setup.py --replace ", 'pytest-cov'" ""
+ '';
+
+ propagatedBuildInputs = [
+ pandas
+ numpy
+ scipy
+ filelock
+ ];
+
+ # The test suite is computationally intensive and test failures are not
+ # indicative for package usability hence tests are disabled by default.
+ doCheck = false;
+ pythonImportsCheck = [ "theano" ];
+
+ meta = {
+ description = "PyMC theano fork";
+ homepage = "https://github.com/majidaldo/Theano-PyMC";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ nidabdella ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
index c6d5fbffc5..ce4ae1a887 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "twitchapi";
- version = "2.5.2";
+ version = "2.5.3";
format = "setuptools";
src = fetchPypi {
pname = "twitchAPI";
inherit version;
- sha256 = "f0ee5388911154375170a83df9a18e8a698fe382cea5d94a3e33ad27a7ce9133";
+ sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704";
};
propagatedBuildInputs = [
@@ -43,6 +43,6 @@ buildPythonPackage rec {
description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub";
homepage = "https://github.com/Teekeks/pyTwitchAPI";
license = licenses.mit;
- maintainers = with maintainers; [ dotlambda ];
+ maintainers = with maintainers; [ dotlambda wolfangaukang ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix
index 24ee2ce5b2..46fe7da5d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
- version = "57.4.9";
+ version = "57.4.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU=";
+ sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ=";
};
# Module doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
index 868ad5fed9..cbc03ea0d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
@@ -6,19 +6,23 @@
buildPythonPackage rec {
pname = "versioneer";
- version = "0.21";
- disabled = pythonOlder "3.6";
+ version = "0.22";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20";
+ hash = "sha256-nw6aLLXvUhy/0QTUOiCN2RJN+0rM+nLWlODQQwoBQrw=";
};
# Couldn't get tests to work because, for instance, they used virtualenv and
# pip.
doCheck = false;
- pythonImportsCheck = [ "versioneer" ];
+ pythonImportsCheck = [
+ "versioneer"
+ ];
meta = with lib; {
description = "Version-string management for VCS-controlled trees";
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
index 6a4a87bc89..7bad0b442d 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -1,6 +1,6 @@
{ stdenv, runCommand, ruby, lib, rsync
, defaultGemConfig, buildRubyGem, buildEnv
-, makeWrapper
+, makeBinaryWrapper
, bundler
}@defs:
@@ -118,9 +118,12 @@ let
wrappedRuby = stdenv.mkDerivation {
name = "wrapped-ruby-${pname'}";
- nativeBuildInputs = [ makeWrapper ];
- inherit (ruby) gemPath meta;
- buildCommand = ''
+
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ dontUnpack = true;
+
+ buildPhase = ''
mkdir -p $out/bin
for i in ${ruby}/bin/*; do
makeWrapper "$i" $out/bin/$(basename "$i") \
@@ -131,6 +134,15 @@ let
--set GEM_PATH ${basicEnv}/${ruby.gemPath}
done
'';
+
+ dontInstall = true;
+
+ doCheck = true;
+ checkPhase = ''
+ $out/bin/ruby --help > /dev/null
+ '';
+
+ inherit (ruby) meta;
};
env = let
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
index 0d634e3ec4..f7618cee56 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
@@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.913";
+ version = "2.0.931";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- hash = "sha256-gSWD3Y7yySJvWicL5zgCGvMWfk98mBdTXB+Xwo4fork=";
+ hash = "sha256-y38oyQVHEi/bXcntxDU0AsOog6Sq/TPvF/NfJjybXiE=";
};
nativeBuildInputs = with py.pkgs; [
@@ -71,6 +71,7 @@ buildPythonApplication rec {
packaging
policyuniverse
prettytable
+ pycep-parser
pyyaml
semantic-version
tabulate
diff --git a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix
index c7a96ce247..9f19dee156 100644
--- a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "avro-tools";
- version = "1.9.2";
+ version = "1.11.0";
src = fetchurl {
url =
"mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
- sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1";
+ sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix
index 271d946000..093a37e2b9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
- version = "1.2.5";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dpdQ1qBfLU6whkqVHQ/zQxqs/y+nmdvxHanaNw66QxA=";
+ sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck=";
};
- cargoSha256 = "sha256-jidZhaB8gF4QBcTvVuygTZdQnlOVwOQO8MMjUuSPht0=";
+ cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
diff --git a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix
new file mode 100644
index 0000000000..340c3b736c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "biodiff";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "8051Enthusiast";
+ repo = "biodiff";
+ rev = "v${version}";
+ sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho=";
+ };
+
+ cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0=";
+
+ meta = with lib; {
+ description = "Hex diff viewer using alignment algorithms from biology";
+ homepage = "https://github.com/8051Enthusiast/biodiff";
+ changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG";
+ license = licenses.mit;
+ maintainers = with maintainers; [ newam ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix
index 7c95565487..82b7ea8ea9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
- version = "0.10.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag=";
+ hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix
index 83d57ba5c2..01cbb22c85 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/webdis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "webdis";
- version = "0.1.19";
+ version = "0.1.20";
src = fetchFromGitHub {
owner = "nicolasff";
repo = pname;
rev = version;
- sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc=";
+ sha256 = "sha256-QvPawRYmk5HcE4XnI4B4G7AAaN/8cFov9lOa2e++g4A=";
};
buildInputs = [ hiredis http-parser jansson libevent ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix
index e37801d272..477b28b6a1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "earthly";
- version = "0.6.9";
+ version = "0.6.10";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
- sha256 = "sha256-FZHz46GUPG5LgJcuKxheERWcctuHdDWgGPslEAu+j08=";
+ sha256 = "sha256-CzVcoIvf9sqomua5AJtNpCnGfPmCNJMwex/l7p+hEfw=";
};
vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
index db9aba705c..336c24819b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
- sha256 = "sha256-uioL4ysioxo+YMCa3VPoUMpY1cVZJ0Jljt8d9jWRT9k=";
+ sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
index 72d5469f0f..4f51c8238c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -28,13 +28,13 @@
}:
mkDerivation rec {
pname = "vaultenv";
- version = "0.13.3";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "channable";
repo = "vaultenv";
rev = "v${version}";
- sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48=";
+ sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI=";
};
buildTools = [ hpack ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix
index f18f3f556c..558c9e019e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix
@@ -1,21 +1,27 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform, stdenv, python3, AppKit, libxcb }:
rustPlatform.buildRustPackage rec {
pname = "jless";
- version = "0.7.2";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "PaulJuliusMartinez";
repo = "jless";
rev = "v${version}";
- sha256 = "sha256-IK+EllkctdhIYuzj7eLjadxKoutICPeSXAjLMFiRjmo=";
+ sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c=";
};
- cargoSha256 = "sha256-CAyKWwtMq5UOODVRrpVHrhlep2wqG434dMGeYV2FSZY=";
+ cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA=";
+
+ nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ];
+
+ buildInputs = [ ]
+ ++ lib.optionals stdenv.isDarwin [ AppKit ]
+ ++ lib.optionals stdenv.isLinux [ libxcb ];
meta = with lib; {
description = "A command-line pager for JSON data";
- homepage = "https://github.com/PaulJuliusMartinez/jless";
+ homepage = "https://jless.io";
license = licenses.mit;
maintainers = with maintainers; [ jfchevrette zowoq ];
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
index 3d4eb2c778..a4fd0ee233 100644
--- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
- version = "0.11.1";
+ version = "0.11.2";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0=";
+ outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
index aa38966b19..8b5e615805 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix
@@ -21,7 +21,7 @@ let ccache = stdenv.mkDerivation rec {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-h1lhR8P4aNM6tQCodhpEIXwA0bUQ26B3aoiQeX2siCU=";
+ sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index eb2e124a35..893a1925dd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, fetchgit, cmake, pcre, doxygen }:
+{ lib, stdenv, fetchFromGitHub, cmake, pcre, doxygen }:
stdenv.mkDerivation rec {
pname = "editorconfig-core-c";
version = "0.12.1";
- src = fetchgit {
- url = "https://github.com/editorconfig/editorconfig-core-c.git";
+ src = fetchFromGitHub {
+ owner = "editorconfig";
+ repo = "editorconfig-core-c";
rev = "v${version}";
- sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
+ sha256 = "sha256-pFsbyqIt7okfaiOwlYN8EXm1SFlCUnsHVbOgyIZZlys=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
index 1e805e8932..3f6ea3b646 100644
--- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "open-policy-agent";
- version = "0.37.2";
+ version = "0.38.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
- sha256 = "sha256-2DkqRKAN7eOTBG6P3YYa5N9oJ0ndm35jIxK7o5Z3dfA=";
+ sha256 = "sha256-RGGxqmQ0mZ5iSAzDvUU6mAlCve3MknuNr2wAzHcV3RQ=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
index fb4abb21c5..212a710de6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/osslsigncode/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "osslsigncode";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "mtrojnar";
repo = pname;
rev = version;
- sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ=";
+ sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
index 0b3b15d85b..d42bb9e286 100644
--- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "packer";
- version = "1.7.10";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "sha256-KkdkLos55n+IE9oIZPADIcSgrE6kn0rDWzEkwoYfoFw=";
+ sha256 = "sha256-rvOfDMALzZx8LfChgB3nC4GCTlSET43SkhW1EkA59zo=";
};
- vendorSha256 = "sha256-oSIwp8t+US8yNziuq0BR8BsVR1/e0jkxE4QuiqyheQQ=";
+ vendorSha256 = "sha256-ZQ+7F49VnpPtxWlZVBez2mpVCx8gIPEDKBD5qM9NcMo=";
subPackages = [ "." ];
@@ -32,7 +32,7 @@ buildGoModule rec {
description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
homepage = "https://www.packer.io";
license = licenses.mpl20;
- maintainers = with maintainers; [ cstrahan zimbatm ma27 ];
+ maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ];
changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md";
platforms = platforms.unix;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index dfed3c91bc..484254a099 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -29,9 +29,9 @@ let
# 2) nix-build -A tree-sitter.updater.update-all-grammars
# 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit
# 4) run the ./result script that is output by that (it updates ./grammars)
- version = "0.20.4";
- sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo=";
- cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs=";
+ version = "0.20.6";
+ sha256 = "sha256-zaxy8VCfJKK8NtfuFFojmmP5a19FP1zO/eB5q1EoQPw=";
+ cargoSha256 = "sha256-sOOhzm2nz+HC6dvT+8hj/wh19o+OB2zQ6Uz+H89txSA=";
src = fetchFromGitHub {
owner = "tree-sitter";
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index acbd23ec29..279f8101f7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "protoc-gen-grpc-web";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-web";
rev = version;
- sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
+ sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
};
sourceRoot = "source/javascript/net/grpc/web/generator";
@@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ protobuf ];
buildInputs = [ protobuf ];
- makeFlags = [ "PREFIX=$(out)" ];
+ makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];
+
+ patches = [
+ # https://github.com/grpc/grpc-web/pull/1210
+ ./optional-static.patch
+ ];
doCheck = true;
checkInputs = [ protobuf ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch
new file mode 100644
index 0000000000..a7ca112749
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11
+ LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl
+ PREFIX ?= /usr/local
+ MIN_MACOS_VERSION := 10.7 # Supports OS X Lion
++STATIC ?= yes
+
+ UNAME_S := $(shell uname -s)
+ ifeq ($(UNAME_S),Darwin)
+ CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION)
+ else ifeq ($(UNAME_S),Linux)
+- LDFLAGS += -static
++ ifeq ($(STATIC),yes)
++ LDFLAGS += -static
++ endif
+ endif
+
+ all: protoc-gen-grpc-web
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix
new file mode 100644
index 0000000000..9a77437a37
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "protoc-gen-validate";
+ version = "0.6.7";
+
+ src = fetchFromGitHub {
+ owner = "envoyproxy";
+ repo = "protoc-gen-validate";
+ rev = "v${version}";
+ sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI=";
+ };
+
+ vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I=";
+
+ excludedPackages = [ "tests" ];
+
+ meta = with lib; {
+ description = "Protobuf plugin for generating polyglot message validators";
+ homepage = "https://github.com/envoyproxy/protoc-gen-validate";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ matthewpi ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix
new file mode 100644
index 0000000000..b9538235c4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "pulumictl";
+ version = "0.0.29";
+
+ src = fetchFromGitHub {
+ owner = "pulumi";
+ repo = "pulumictl";
+ rev = "v${version}";
+ sha256 = "sha256-2jTxtgEg+x/NY/LTWT5+9K9bilOw2bLTUIctjd+qwLE=";
+ };
+
+ vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s=";
+
+ ldflags = [
+ "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}"
+ ];
+
+ subPackages = [ "cmd/pulumictl" ];
+
+ meta = with lib; {
+ description = "Swiss Army Knife for Pulumi Development";
+ homepage = "https://github.com/pulumi/pulumictl";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vincentbernat ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
index 5dee0a1b9e..c28701f96a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
@@ -1,4 +1,5 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }:
+
rustPlatform.buildRustPackage rec {
pname = "rebazel";
version = "0.1.4";
@@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
+
meta = with lib; {
description = "tool for expediting bazel build workflows";
homepage = "https://github.com/meetup/rebazel";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
index caac565e62..e3694b3108 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-OBcRN0tYNnNqytmmAm6DMtHtp+JzPjomfTpeQEtQE84=";
+ sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg=";
};
- cargoSha256 = "sha256-uZw/ojPAzbpRYb2pkJ/i/+GXvxxU6piCLuMG/fPII2M=";
+ cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
passthru = {
updateScript = nix-update-script {
diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix
index 4ec62ed4d2..88fa62903d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix
@@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
- version = "2.6.4";
+ version = "2.6.7";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
- sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k=";
+ sha256 = "sha256-m9vtopRjxT9Re8pDdzfFUpg3zYAFE8zqFemgaNAbsvM=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix
new file mode 100644
index 0000000000..2d0576592e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix
@@ -0,0 +1,78 @@
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, makeWrapper
+, go
+, gcc
+, gtk3
+, webkitgtk
+, nodejs
+, upx
+, zlib
+}:
+
+buildGoModule rec {
+ pname = "wails";
+ version = "2.0.0-beta.33";
+
+ src = fetchFromGitHub {
+ owner = "wailsapp";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-efxOL/FllToum0P4JyAJt0fbrznTFYh7czTWpZu3uk0=";
+ } + "/v2";
+
+ vendorSha256 = "sha256-qPMVsvud2L7hpXUOfYYMiO32JXff8ZZC34EsxFoSJ0g=";
+
+ proxyVendor = true;
+
+ subPackages = [ "cmd/wails" ];
+
+ # These packages are needed to build wails
+ # and will also need to be used when building a wails app.
+ nativeBuildInputs = [
+ pkg-config
+ makeWrapper
+ ];
+
+ # Wails apps are built with Go, so we need to be able to
+ # add it in propagatedBuildInputs.
+ allowGoReference = true;
+
+ # Following packages are required when wails used as a builder.
+ propagatedBuildInputs = [
+ pkg-config
+ go
+ gcc
+ gtk3
+ webkitgtk
+ nodejs
+ upx
+ ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ # As Wails calls a compiler, certain apps and libraries need to be made available.
+ postFixup = ''
+ wrapProgram $out/bin/wails \
+ --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \
+ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \
+ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}"
+ '';
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Build applications using Go + HTML + CSS + JS";
+ homepage = "https://wails.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ianmjones ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
index bfe18fc475..e8cd2a134f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.21.1";
+ version = "4.22.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
- sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU=";
+ sha256 = "sha256-+yVf9pSK2cH/d5fdaGSBrjce8vVqE9XMpZSI8s4xoJI=";
};
vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
index fb13244daf..7f8498a352 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ytt";
- version = "0.40.0";
+ version = "0.40.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-ytt";
rev = "v${version}";
- sha256 = "sha256-Oc4hNeSDsGHsA7V05LHFAJ5xvxWth2wEd3ag2ltVR10=";
+ sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix
index 2a888b8056..fecf7610d1 100644
--- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
- version = "4.1.0.M1";
+ version = "5.1.2";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
- sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr";
+ sha256 = "sha256-S8YDGShglCB8zMHBwLlvPwq9dIAgQq2Xb8G1Pf0dXiQ=";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index 663dffe249..3c083c555d 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.53.tar.xz",
+ "name": "factorio_alpha_x64-1.1.56.tar.xz",
"needsAuth": true,
- "sha256": "1l5sk9rhf4pq9l87w5sv4a1ikqx8rpby5hf4xn7sdsm9mshd3wyw",
+ "sha256": "1i9mcq8m48ar0b3x53zgi5x9rsaddmlm2wqaphyf81xampl7ivcx",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.53/alpha/linux64",
- "version": "1.1.53"
+ "url": "https://factorio.com/get-download/1.1.56/alpha/linux64",
+ "version": "1.1.56"
},
"stable": {
"name": "factorio_alpha_x64-1.1.53.tar.xz",
@@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
- "name": "factorio_demo_x64-1.1.53.tar.xz",
+ "name": "factorio_demo_x64-1.1.56.tar.xz",
"needsAuth": false,
- "sha256": "0m3mk296w4azma2v5z6pay1caqql2jfnlcyyd120laxl4rdg2k76",
+ "sha256": "0g1gphysh79h1frcjpfd5i3fpi05y8mq9gwmgnmalmr56w5n4qlz",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.53/demo/linux64",
- "version": "1.1.53"
+ "url": "https://factorio.com/get-download/1.1.56/demo/linux64",
+ "version": "1.1.56"
},
"stable": {
"name": "factorio_demo_x64-1.1.53.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.53.tar.xz",
+ "name": "factorio_headless_x64-1.1.56.tar.xz",
"needsAuth": false,
- "sha256": "18ra52h32nhdqxz6vagp9nw3an5pgamariy0ny050xr2xpidw3v1",
+ "sha256": "174fvi9slpdp3y8j46w0w0ays7i7gy98il74xx5wxh7s94zb1b68",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.53/headless/linux64",
- "version": "1.1.53"
+ "url": "https://factorio.com/get-download/1.1.56/headless/linux64",
+ "version": "1.1.56"
},
"stable": {
"name": "factorio_headless_x64-1.1.53.tar.xz",
diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix
index 567ab267cf..10d7a23aca 100644
--- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix
+++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
- version = "0.9.12";
+ version = "0.9.13";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
- sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A=";
+ sha256 = "sha256-+VAgS7NR/D0HD/Fy7idSUTMJPp2ctpirMpcFooo+bEg=";
};
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
diff --git a/third_party/nixpkgs/pkgs/games/steam/default.nix b/third_party/nixpkgs/pkgs/games/steam/default.nix
index bfe19a88ca..430a2b3a67 100644
--- a/third_party/nixpkgs/pkgs/games/steam/default.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/default.nix
@@ -14,7 +14,6 @@ let
steam-runtime = callPackage ./runtime.nix { };
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
steam = callPackage ./steam.nix { };
- steam-fonts = callPackage ./fonts.nix { };
steam-fhsenv = callPackage ./fhsenv.nix {
glxinfo-i686 = pkgsi686Linux.glxinfo;
steam-runtime-wrapped-i686 =
diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
index bd0abf48bb..cd2046b238 100644
--- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix
@@ -15,7 +15,6 @@
let
commonTargetPkgs = pkgs: with pkgs;
[
- steamPackages.steam-fonts
# Needed for operating system detection until
# https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
lsb-release
@@ -167,7 +166,6 @@ in buildFHSUserEnv rec {
ffmpeg
# Only libraries are needed from those two
libudev0-shim
- networkmanager098
# Verified games requirements
xorg.libXt
diff --git a/third_party/nixpkgs/pkgs/games/steam/fonts.nix b/third_party/nixpkgs/pkgs/games/steam/fonts.nix
deleted file mode 100644
index 65efd42a22..0000000000
--- a/third_party/nixpkgs/pkgs/games/steam/fonts.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation {
- pname = "steam-fonts";
- version = "1";
-
- src = fetchurl {
- url = "https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip";
- sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0";
- };
-
- nativeBuildInputs = [ unzip ];
-
- sourceRoot = ".";
-
- installPhase = ''
- mkdir -p $out/share/fonts/truetype
- cp -r *.TTF *.ttf $out/share/fonts/truetype
- '';
-}
diff --git a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
index c4094f2816..0100418326 100644
--- a/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
+++ b/third_party/nixpkgs/pkgs/games/terraria-server/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "terraria-server";
- version = "1.4.3.2";
+ version = "1.4.3.5";
urlVersion = lib.replaceChars [ "." ] [ "" ] version;
src = fetchurl {
url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip";
- sha256 = "sha256-/OClQTO9iBRQk3iTvYbjG1cCicKIBh+yi2OFpurJx8U=";
+ sha256 = "sha256-N1GnxEe0A6Wuzy08lL3CFPWjQJECGGf504FE+lnhDcw=";
};
buildInputs = [ file ];
diff --git a/third_party/nixpkgs/pkgs/games/ufoai/default.nix b/third_party/nixpkgs/pkgs/games/ufoai/default.nix
index 89f8f5ec91..1dc2abbf76 100644
--- a/third_party/nixpkgs/pkgs/games/ufoai/default.nix
+++ b/third_party/nixpkgs/pkgs/games/ufoai/default.nix
@@ -24,7 +24,13 @@ stdenv.mkDerivation rec {
curl libjpeg libpng gettext cunit
];
- NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1
+ NIX_CFLAGS_LINK = [
+ # to avoid occasional runtime error in finding libgcc_s.so.1
+ "-lgcc_s"
+ # tests are underlinked against libm:
+ # ld: release-linux-x86_64/testall/client/sound/s_mix.c.o: undefined reference to symbol 'acos@@GLIBC_2.2.5'
+ "-lm"
+ ];
meta = {
homepage = "http://ufoai.org";
diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix
index d58c9aee0d..50db51b4e8 100644
--- a/third_party/nixpkgs/pkgs/games/unciv/default.nix
+++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.19.8";
+ version = "3.19.12";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "sha256-ubMREVcislhkA3pzxuqI+HpBHq9vbMa8nyq0qhTh2x8=";
+ sha256 = "sha256-PALrOyaUYXyNH+QdE8oy1TM5U4SZjw1N0NJ2BKiqjtU=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/third_party/nixpkgs/pkgs/misc/dxvk/darwin-dxvk-compat.patch
new file mode 100644
index 0000000000..1c68659215
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/dxvk/darwin-dxvk-compat.patch
@@ -0,0 +1,35 @@
+Source: https://github.com/marzent/dxvk/commit/65247afe2de5dd6b555b8fdd46dddcdc6325e1d6
+---
+ src/d3d11/d3d11_device.cpp | 12 +-
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
+index 21f0d1b4a..5b1d05335 100644
+--- a/src/d3d11/d3d11_device.cpp
++++ b/src/d3d11/d3d11_device.cpp
+@@ -799,8 +799,12 @@ namespace dxvk {
+ InitReturnPtr(ppGeometryShader);
+ D3D11CommonShader module;
+
+- if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback)
+- return DXGI_ERROR_INVALID_CALL;
++ if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) {
++ Logger::err(
++ "D3D11: CreateGeometryShaderWithStreamOutput:"
++ "\n Transform feedback not supported by device");
++ return S_OK;
++ }
+
+ // Zero-init some counterss so that we can increment
+ // them while walking over the stream output entries
+@@ -1973,8 +1977,8 @@ namespace dxvk {
+ enabled.core.features.logicOp = supported.core.features.logicOp;
+ enabled.core.features.shaderImageGatherExtended = VK_TRUE;
+ enabled.core.features.variableMultisampleRate = supported.core.features.variableMultisampleRate;
+- enabled.extTransformFeedback.transformFeedback = VK_TRUE;
+- enabled.extTransformFeedback.geometryStreams = VK_TRUE;
++ enabled.extTransformFeedback.transformFeedback = supported.extTransformFeedback.transformFeedback;
++ enabled.extTransformFeedback.geometryStreams = supported.extTransformFeedback.geometryStreams;
+ }
+
+ if (featureLevel >= D3D_FEATURE_LEVEL_10_1) {
diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/darwin-moltenvk-compat.patch b/third_party/nixpkgs/pkgs/misc/dxvk/darwin-moltenvk-compat.patch
new file mode 100644
index 0000000000..7d16fdf703
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/dxvk/darwin-moltenvk-compat.patch
@@ -0,0 +1,59 @@
+Source: https://github.com/Gcenx/MoltenVK/commit/1f268bd45f6c928784d7cb90dedce382895f10ae
+
+Fake extensions for DXVK;
+- _features.geometryShader
+- _features.tessellationShader
+- _features.shaderCullDistance
+
+Enabled defaults;
+- MVK_ALLOW_METAL_FENCES=1
+- MVK_CONFIG_RESUME_LOST_DEVICE=1
+---
+ MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 3 +++
+ MoltenVK/MoltenVK/Utility/MVKEnvironment.h | 4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+index bc6d19df..e1959c6e 100644
+--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
++++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+@@ -1656,6 +1656,8 @@
+ _features.robustBufferAccess = true; // XXX Required by Vulkan spec
+ _features.fullDrawIndexUint32 = true;
+ _features.independentBlend = true;
++ _features.geometryShader = true; // XXX Required by DXVK for D3D10
++ _features.tessellationShader = true; // XXX Required by DXVK for D3D11
+ _features.sampleRateShading = true;
+ _features.depthBiasClamp = true;
+ _features.fillModeNonSolid = true;
+@@ -1669,6 +1671,7 @@
+ _features.shaderUniformBufferArrayDynamicIndexing = true;
+ _features.shaderStorageBufferArrayDynamicIndexing = true;
+ _features.shaderClipDistance = true;
++ _features.shaderCullDistance = true; // XXX Required by DXVK for 10level9
+ _features.shaderInt16 = true;
+ _features.multiDrawIndirect = true;
+ _features.inheritedQueries = true;
+diff --git a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
+index 81d0defc..80c414d3 100644
+--- a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
++++ b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
+@@ -240,7 +240,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig);
+ # define MVK_ALLOW_METAL_EVENTS 1
+ #endif
+ #ifndef MVK_ALLOW_METAL_FENCES
+-# define MVK_ALLOW_METAL_FENCES 0
++# define MVK_ALLOW_METAL_FENCES 1 // XXX Required by DXVK for Apple/NVidia GPUs (better FPS than CPU Emulation)
+ #endif
+
+ /** Substitute Metal 2D textures for Vulkan 1D images. Enabled by default. */
+@@ -275,7 +275,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig);
+
+ /** Resume MVKDevice VK_ERROR_DEVICE_LOST errors that do not cause MVKPhysicalDevice errors. Disabled by default. */
+ #ifndef MVK_CONFIG_RESUME_LOST_DEVICE
+-# define MVK_CONFIG_RESUME_LOST_DEVICE 0
++# define MVK_CONFIG_RESUME_LOST_DEVICE 1
+ #endif
+
+ /** Support Metal argument buffers. Disabled by default. */
+
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix
new file mode 100644
index 0000000000..61e2d78b45
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix
@@ -0,0 +1,80 @@
+{ lib
+, pkgs
+, stdenv
+, fetchFromGitHub
+, pkgsCross
+}:
+
+let
+ # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that
+ # needs to be built with a cross-compiler.
+ dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
+ dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
+
+ # Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive
+ # attrset wouldn’t work.
+ self = stdenv.mkDerivation {
+ name = "dxvk";
+ version = "1.10";
+
+ src = fetchFromGitHub {
+ owner = "doitsujin";
+ repo = "dxvk";
+ rev = "v${self.version}";
+ hash = "sha256-/zH6vER/6s/d+Tt181UJOa97sqdkJyKGw6E36+1owzQ=";
+ };
+
+ # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
+ # Some games will work poorly (particularly Unreal Engine 4 games), but others work pretty well.
+ # Override this to patch DXVK itself (rather than the setup script).
+ dxvkPatches = lib.optional stdenv.isDarwin ./darwin-dxvk-compat.patch;
+
+ outputs = [ "out" "bin" "lib" ];
+
+ # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment.
+ patches = [ ./mcfgthread.patch ];
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin $bin $lib
+ substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \
+ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \
+ --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \
+ --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin"
+ chmod a+x $out/bin/setup_dxvk.sh
+ declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
+ for arch in "''${!dxvks[@]}"; do
+ ln -s "''${dxvks[$arch]}/bin" $bin/$arch
+ ln -s "''${dxvks[$arch]}/lib" $lib/$arch
+ done
+ '';
+
+ # DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a
+ # convenience function to handle the necessary patching.
+ # Usage:
+ # let
+ # patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk;
+ # in
+ # wine64Packages.full.override { moltenvk = patchedMoltenVK; vkd3dSupport = false; }
+ passthru.patchMoltenVK = moltenvk:
+ moltenvk.overrideAttrs (old: {
+ patches = old.patches or [ ] ++ [
+ # Lie to DXVK about certain features that DXVK expects to be available and set defaults
+ # for better performance/compatability on certain hardware.
+ ./darwin-moltenvk-compat.patch
+ ];
+ });
+
+ meta = {
+ description = "A Vulkan-based translation layer for Direct3D 9/10/11";
+ homepage = "https://github.com/doitsujin/dxvk";
+ changelog = "https://github.com/doitsujin/dxvk/releases";
+ maintainers = [ lib.maintainers.reckenrode ];
+ license = lib.licenses.zlib;
+ platforms = lib.platforms.unix;
+ };
+ };
+in
+self
diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix
new file mode 100644
index 0000000000..40b674df92
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix
@@ -0,0 +1,52 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, glslang
+, meson
+, ninja
+, windows
+, src
+, version
+, dxvkPatches
+}:
+
+stdenv.mkDerivation {
+ pname = "dxvk";
+ inherit src version;
+
+ nativeBuildInputs = [ glslang meson ninja ];
+ buildInputs = [ windows.pthreads ];
+
+ patches = dxvkPatches;
+
+ # Replace use of DXVK’s threading classes with the ones from the C++ standard library, which uses
+ # mcfgthreads in nixpkgs.
+ postPatch = ''
+ for class in mutex recursive_mutex condition_variable; do
+ for file in $(grep -rl dxvk::$class *); do
+ if [ "$(basename "$file")" != "thread.h" ]; then
+ substituteInPlace "$file" --replace dxvk::$class std::$class
+ fi
+ done
+ done
+ '';
+
+ mesonFlags =
+ let
+ arch = if stdenv.is32bit then "32" else "64";
+ in
+ [
+ "--buildtype" "release"
+ "--cross-file" "build-win${arch}.txt"
+ "--prefix" "${placeholder "out"}"
+ ];
+
+ meta = {
+ description = "A Vulkan-based translation layer for Direct3D 9/10/11";
+ homepage = "https://github.com/doitsujin/dxvk";
+ changelog = "https://github.com/doitsujin/dxvk/releases";
+ maintainers = [ lib.maintainers.reckenrode ];
+ license = lib.licenses.zlib;
+ platforms = lib.platforms.windows;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch b/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch
new file mode 100644
index 0000000000..0370716301
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch
@@ -0,0 +1,34 @@
+diff --git a/setup_dxvk.sh b/setup_dxvk.sh
+index 3e63ecf0..87c04f23 100755
+--- a/setup_dxvk.sh
++++ b/setup_dxvk.sh
+@@ -133,6 +133,8 @@
+ rm -v "${dstfile}"
+ fi
+ $file_cmd "${srcfile}" "${dstfile}"
++ elif [ "${4}" = "--force" ]; then
++ $file_cmd "${srcfile}" "${dstfile}"
+ else
+ echo "${dstfile}: File not found in wine prefix" >&2
+ return 1
+@@ -170,12 +172,12 @@
+ }
+
+ install() {
+- installFile "$win64_sys_path" "$dxvk_lib64" "$1"
++ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}"
+ inst64_ret="$?"
+
+ inst32_ret=-1
+ if $wow64; then
+- installFile "$win32_sys_path" "$dxvk_lib32" "$1"
++ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}"
+ inst32_ret="$?"
+ fi
+
+@@ -214,3 +216,5 @@
+
+ $action d3d10core
+ $action d3d11
++
++basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force
diff --git a/third_party/nixpkgs/pkgs/misc/i3a/default.nix b/third_party/nixpkgs/pkgs/misc/i3a/default.nix
new file mode 100644
index 0000000000..36f58c16cc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/i3a/default.nix
@@ -0,0 +1,21 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "i3a";
+ version = "2.0.1";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ hash = "sha256-2k1HYtgJ76qXLvX6RmOSKtMMg+K722n8U9YmBANvQvE=";
+ };
+
+ nativeBuildInputs = [ python3Packages.setuptools-scm ];
+ propagatedBuildInputs = [ python3Packages.i3ipc ];
+
+ meta = with lib; {
+ homepage = "https://git.goral.net.pl/mgoral/i3a";
+ description = "A set of scripts used for automation of i3 and sway window manager layouts";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ fortuneteller2k ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
index 5d7a344088..986494e599 100644
--- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix
@@ -111,7 +111,7 @@ let
homepage = "http://www.denx.de/wiki/U-Boot/";
description = "Boot loader for embedded systems";
license = licenses.gpl2;
- maintainers = with maintainers; [ dezgeg samueldr lopsided98 ];
+ maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ];
} // extraMeta;
} // removeAttrs args [ "extraMeta" ]);
in {
@@ -139,6 +139,12 @@ in {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
+ ubootA20OlinuxinoLime2EMMC = buildUBoot {
+ defconfig = "A20-OLinuXino-Lime2-eMMC_defconfig";
+ extraMeta.platforms = ["armv7l-linux"];
+ filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+ };
+
ubootAmx335xEVM = buildUBoot {
defconfig = "am335x_evm_defconfig";
extraMeta.platforms = ["armv7l-linux"];
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix
index be44db38fe..cc5c4ae204 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }:
+{ lib, stdenv, fetchFromGitHub, memstreamHook, Carbon, Cocoa, SkyLight }:
let
inherit (stdenv.hostPlatform) system;
@@ -10,20 +10,17 @@ in
stdenv.mkDerivation rec {
pname = "sketchybar";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "FelixKratz";
repo = "SketchyBar";
rev = "v${version}";
- sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb";
+ sha256 = "sha256-ucTyJhRhSVyE4E/x6PtFz7nHRUg6cKKVOrRpPs39iO8=";
};
- buildInputs = [ Carbon Cocoa SkyLight ];
-
- postPatch = ''
- sed -i -e '/^#include /d' src/*.[ch] src/*/*.[ch]
- '';
+ buildInputs = [ Carbon Cocoa SkyLight ]
+ ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ];
makeFlags = [
target
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
index 9e21955808..7aaedb5b1a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab
, enableStatic ? stdenv.hostPlatform.isStatic
, enableMinimal ? false
+, enableAppletSymlinks ? true
# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping:
# nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
@@ -95,6 +96,11 @@ stdenv.mkDerivation rec {
CONFIG_STATIC y
''}
+ ${lib.optionalString (!enableAppletSymlinks) ''
+ CONFIG_INSTALL_APPLET_DONT y
+ CONFIG_INSTALL_APPLET_SYMLINKS n
+ ''}
+
# Use the external mount.cifs program.
CONFIG_FEATURE_MOUNT_CIFS n
CONFIG_FEATURE_MOUNT_HELPERS y
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix
index 930e9381bb..46e8360972 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/earlyoom/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "earlyoom";
- version = "1.6.2";
+ version = "1.7";
src = fetchFromGitHub {
owner = "rfjakob";
repo = "earlyoom";
rev = "v${version}";
- sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq";
+ sha256 = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc=";
};
nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 66194430b2..bdb2fc3472 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -1,28 +1,27 @@
diff --git a/data/meson.build b/data/meson.build
-index f10d4ff6..2dc66fb6 100644
+index 2ae29ce5..342cac92 100644
--- a/data/meson.build
+++ b/data/meson.build
-@@ -21,7 +21,7 @@ endif
+@@ -26,7 +26,7 @@ endif
if build_standalone
install_data(['daemon.conf'],
- install_dir : join_paths(sysconfdir, 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
)
- install_data(['power.quirk'],
+ install_data(['power.quirk', 'cfi.quirk'],
install_dir: join_paths(datadir, 'fwupd', 'quirks.d'))
diff --git a/data/pki/meson.build b/data/pki/meson.build
-index dcd9e128..ff137f3a 100644
+index 2a7d0f24..091981f7 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
-@@ -2,24 +2,23 @@ install_data([
+@@ -12,13 +12,13 @@ install_data([
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
)
-
install_data([
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
@@ -30,7 +29,9 @@ index dcd9e128..ff137f3a 100644
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
+ endif
+@@ -26,11 +26,11 @@ if supported_pkcs7 == '1'
install_data([
'LVFS-CA.pem',
],
@@ -43,7 +44,7 @@ index dcd9e128..ff137f3a 100644
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
--
+ endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index 02d8777b..2c89d593 100644
--- a/data/remotes.d/meson.build
@@ -82,10 +83,10 @@ index 02d8777b..2c89d593 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
-index 7557cd4a..4c98de6d 100644
+index 394f40fa..7b602c73 100644
--- a/meson.build
+++ b/meson.build
-@@ -190,6 +190,12 @@ endif
+@@ -187,6 +187,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@@ -99,14 +100,14 @@ index 7557cd4a..4c98de6d 100644
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
-index 94f73898..5de6cc7b 100644
+index c1b483cb..047dbdd8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
- option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation')
+ option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index e9f12879..a0126dbb 100644
--- a/plugins/dell-esrt/meson.build
@@ -119,8 +120,21 @@ index e9f12879..a0126dbb 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
endif
+diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
+index 3ea47456..40dbd116 100644
+--- a/plugins/msr/meson.build
++++ b/plugins/msr/meson.build
+@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'],
+ endif
+
+ install_data(['msr.conf'],
+- install_dir: join_paths(sysconfdir, 'fwupd')
++ install_dir: join_paths(sysconfdir_install, 'fwupd')
+ )
+ shared_module('fu_plugin_msr',
+ fu_hash,
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
-index 5263048c..c46fac64 100644
+index 4a0a8664..7d9ba77d 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish',
@@ -129,14 +143,14 @@ index 5263048c..c46fac64 100644
install_data(['redfish.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
- install_mode: 'rw-r-----',
)
+ if get_option('tests')
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
-index 646ed6cb..8d7c59aa 100644
+index 1ba9562f..c074f770 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
-@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
+@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
)
install_data(['thunderbolt.conf'],
@@ -146,7 +160,7 @@ index 646ed6cb..8d7c59aa 100644
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
-index 708586b0..f29536b1 100644
+index 04cbd51a..9a8c43de 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -21,7 +21,7 @@ if host_machine.system() == 'linux'
@@ -158,7 +172,7 @@ index 708586b0..f29536b1 100644
)
elif host_machine.system() == 'freebsd'
backend_srcs += 'fu-uefi-backend-freebsd.c'
-@@ -116,7 +116,7 @@ if get_option('man')
+@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man')
endif
install_data(['uefi_capsule.conf'],
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 077c37a72c..272bd6dbe8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -12,6 +12,7 @@
, libgudev
, polkit
, libxmlb
+, glib
, gusb
, sqlite
, libarchive
@@ -50,6 +51,9 @@
, nixosTests
, runCommand
, unstableGitUpdater
+, modemmanager
+, libqmi
+, libmbim
}:
let
@@ -112,7 +116,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.7.2";
+ version = "1.7.6";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -121,7 +125,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ=";
+ sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo=";
};
patches = [
@@ -136,15 +140,26 @@ let
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
+ # Fix detection of installed tests
+ # https://github.com/fwupd/fwupd/issues/3880
+ (fetchpatch {
+ url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch";
+ sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g=";
+ })
+
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
./installed-tests-path.patch
- # Tests detect fwupd is installed when prefix is /usr.
- ./fix-install-detection.patch
-
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
+
+ # Drop hard-coded FHS path
+ # https://github.com/fwupd/fwupd/issues/4360
+ (fetchpatch {
+ url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch";
+ sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM=";
+ })
];
nativeBuildInputs = [
@@ -187,6 +202,9 @@ let
efivar
fwupd-efi
protobufc
+ modemmanager
+ libmbim
+ libqmi
] ++ lib.optionals haveDell [
libsmbios
];
@@ -206,6 +224,7 @@ let
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
+ "-Dplugin_modem_manager=true"
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
@@ -250,6 +269,9 @@ let
contrib/generate-version-script.py \
meson_post_install.sh \
po/test-deps
+
+ substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
+ --replace "gdbus" ${glib.bin}/bin/gdbus
'';
preCheck = ''
@@ -301,6 +323,7 @@ let
passthru = {
filesInstalledToEtc = [
"fwupd/daemon.conf"
+ "fwupd/msr.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch
deleted file mode 100644
index 56d7def5c1..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
-index 4710c769..1c68fdb9 100644
---- a/plugins/redfish/fu-self-test.c
-+++ b/plugins/redfish/fu-self-test.c
-@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
- const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
- if (builddir == NULL)
- return FALSE;
-- return g_str_has_prefix(builddir, "/usr");
-+ return g_str_has_prefix(builddir, "/nix");
- }
-
- static void
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
index 2024e84b0a..ea50d88dfe 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
@@ -1,8 +1,8 @@
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
-index adadbcdd..1b51bb9c 100644
+index b8ec916f0..38209b363 100644
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
-@@ -65,5 +65,5 @@ configure_file(
+@@ -83,5 +83,5 @@ configure_file(
output : 'fwupd-tests.conf',
configuration : con2,
install: true,
@@ -10,10 +10,10 @@ index adadbcdd..1b51bb9c 100644
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
-index 772b7bbe..f59302cd 100644
+index 32fe6e408..b35d741e0 100644
--- a/meson.build
+++ b/meson.build
-@@ -177,8 +177,8 @@ else
+@@ -183,8 +183,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
@@ -24,6 +24,14 @@ index 772b7bbe..f59302cd 100644
endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
+@@ -484,6 +484,7 @@ gnome = import('gnome')
+ i18n = import('i18n')
+
+ conf.set_quoted('FWUPD_PREFIX', prefix)
++conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix'))
+ conf.set_quoted('FWUPD_BINDIR', bindir)
+ conf.set_quoted('FWUPD_LIBDIR', libdir)
+ conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index 0a0e2853..5f68d78b 100644
--- a/meson_options.txt
@@ -36,3 +44,16 @@ index 0a0e2853..5f68d78b 100644
option('tests', type : 'boolean', value : true, description : 'enable tests')
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
+diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
+index c507fabc8..0cddc3248 100644
+--- a/plugins/redfish/fu-self-test.c
++++ b/plugins/redfish/fu-self-test.c
+@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
+ const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
+ if (builddir == NULL)
+ return FALSE;
+- return g_str_has_prefix(builddir, FWUPD_PREFIX);
++ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX);
+ }
+
+ static void
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index 34e1b10b32..671fdef2f5 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
@@ -65,7 +65,7 @@ let
X86_INTEL_PSTATE = yes;
INTEL_IDLE = yes;
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
- CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes;
+ CPU_FREQ_GOV_SCHEDUTIL = yes;
PM_WAKELOCKS = yes;
# Power-capping framework and support for INTEL RAPL
POWERCAP = yes;
@@ -148,12 +148,12 @@ let
IPV6_MROUTE = yes;
IPV6_MROUTE_MULTIPLE_TABLES = yes;
IPV6_PIMSM_V2 = yes;
- IPV6_FOU_TUNNEL = whenAtLeast "4.7" module;
+ IPV6_FOU_TUNNEL = module;
IPV6_SEG6_LWTUNNEL = whenAtLeast "4.10" yes;
IPV6_SEG6_HMAC = whenAtLeast "4.10" yes;
IPV6_SEG6_BPF = whenAtLeast "4.18" yes;
- NET_CLS_BPF = whenAtLeast "4.4" module;
- NET_ACT_BPF = whenAtLeast "4.4" module;
+ NET_CLS_BPF = module;
+ NET_ACT_BPF = module;
NET_SCHED = yes;
L2TP_V3 = yes;
L2TP_IP = module;
@@ -168,7 +168,7 @@ let
PPP_FILTER = yes;
# needed for iwd WPS support (wpa_supplicant replacement)
- KEY_DH_OPERATIONS = whenAtLeast "4.7" yes;
+ KEY_DH_OPERATIONS = yes;
# needed for nftables
# Networking Options
@@ -208,7 +208,7 @@ let
INET_TCP_DIAG = mkDefault module;
INET_UDP_DIAG = mkDefault module;
INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module);
- INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes);
+ INET_DIAG_DESTROY = mkDefault yes;
# enable multipath-tcp
MPTCP = whenAtLeast "5.6" yes;
@@ -267,11 +267,11 @@ let
# necessary for amdgpu polaris support
DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes;
# (experimental) amdgpu support for verde and newer chipsets
- DRM_AMDGPU_SI = whenAtLeast "4.9" yes;
+ DRM_AMDGPU_SI = yes;
# (stable) amdgpu support for bonaire and newer chipsets
- DRM_AMDGPU_CIK = whenAtLeast "4.9" yes;
+ DRM_AMDGPU_CIK = yes;
# Allow device firmware updates
- DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes;
+ DRM_DP_AUX_CHARDEV = yes;
# amdgpu display core (DC) support
DRM_AMD_DC_DCN1_0 = whenBetween "4.15" "5.6" yes;
DRM_AMD_DC_PRE_VEGA = whenBetween "4.15" "4.18" yes;
@@ -403,7 +403,6 @@ let
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
UDF_FS = module;
- NFSD_PNFS = whenBetween "4.0" "4.6" yes;
NFSD_V2_ACL = yes;
NFSD_V3 = yes;
NFSD_V3_ACL = yes;
@@ -460,7 +459,7 @@ let
DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; };
RANDOMIZE_BASE = option yes;
STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem
- IO_STRICT_DEVMEM = whenAtLeast "4.5" (mkDefault yes);
+ IO_STRICT_DEVMEM = mkDefault yes;
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes;
@@ -515,10 +514,9 @@ let
MEMCG = yes;
MEMCG_SWAP = yes;
- DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes;
BLK_DEV_THROTTLING = yes;
CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1
- CGROUP_PIDS = whenAtLeast "4.3" yes;
+ CGROUP_PIDS = yes;
};
staging = {
@@ -543,9 +541,9 @@ let
STACK_TRACER = yes;
UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";};
UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";};
- BPF_SYSCALL = whenAtLeast "4.4" yes;
+ BPF_SYSCALL = yes;
BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.15" yes;
- BPF_EVENTS = whenAtLeast "4.4" yes;
+ BPF_EVENTS = yes;
FUNCTION_PROFILER = yes;
RING_BUFFER_BENCHMARK = no;
};
@@ -556,11 +554,10 @@ let
HYPERVISOR_GUEST = yes;
PARAVIRT_SPINLOCKS = option yes;
- KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes;
KVM_ASYNC_PF = yes;
KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; };
KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; };
- KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes;
+ KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes;
KVM_GUEST = yes;
KVM_MMIO = yes;
KVM_VFIO = yes;
@@ -774,14 +771,14 @@ let
SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
- BT_HCIUART_QCA = whenAtLeast "4.3" yes; # Qualcomm Atheros protocol support
+ BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support
BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA
- BT_HCIUART = whenAtLeast "2.5.45" module; # required for BT devices with serial port interface (QCA6390)
+ BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
BT_HCIUART_BCSP = option yes;
BT_HCIUART_H4 = option yes; # UART (H4) protocol support
BT_HCIUART_LL = option yes;
BT_RFCOMM_TTY = option yes; # RFCOMM TTY support
- BT_QCA = whenAtLeast "4.3" module; # enables QCA6390 bluetooth
+ BT_QCA = module; # enables QCA6390 bluetooth
CLEANCACHE = option yes;
CRASH_DUMP = option no;
@@ -820,14 +817,12 @@ let
MEDIA_ATTACH = yes;
MEGARAID_NEWGEN = yes;
- MLX4_EN_VXLAN = whenOlder "4.8" yes;
MLX5_CORE_EN = option yes;
NVME_MULTIPATH = whenAtLeast "4.15" yes;
PSI = whenAtLeast "4.20" yes;
- MODVERSIONS = whenOlder "4.9" yes;
MOUSE_ELAN_I2C_SMBUS = yes;
MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
MOUSE_PS2_VMMOUSE = yes;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
deleted file mode 100644
index 8f2418c9ef..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch
+++ /dev/null
@@ -1,407 +0,0 @@
-commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b
-Author: Tejun Heo
-Date: Fri Mar 11 07:31:23 2016 -0500
-
- sched: Misc preps for cgroup unified hierarchy interface
-
- Make the following changes in preparation for the cpu controller
- interface implementation for the unified hierarchy. This patch
- doesn't cause any functional differences.
-
- * s/cpu_stats_show()/cpu_cfs_stats_show()/
-
- * s/cpu_files/cpu_legacy_files/
-
- * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While
- at it, remove pointless cpuacct_stat_desc[] array.
-
- Signed-off-by: Tejun Heo
- Cc: Ingo Molnar
- Cc: Peter Zijlstra
- Cc: Li Zefan
- Cc: Johannes Weiner
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 732e993..77f3ddd 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)
- return ret;
- }
-
--static int cpu_stats_show(struct seq_file *sf, void *v)
-+static int cpu_cfs_stats_show(struct seq_file *sf, void *v)
- {
- struct task_group *tg = css_tg(seq_css(sf));
- struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
-@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css,
- }
- #endif /* CONFIG_RT_GROUP_SCHED */
-
--static struct cftype cpu_files[] = {
-+static struct cftype cpu_legacy_files[] = {
- #ifdef CONFIG_FAIR_GROUP_SCHED
- {
- .name = "shares",
-@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = {
- },
- {
- .name = "stat",
-- .seq_show = cpu_stats_show,
-+ .seq_show = cpu_cfs_stats_show,
- },
- #endif
- #ifdef CONFIG_RT_GROUP_SCHED
-@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
- .fork = cpu_cgroup_fork,
- .can_attach = cpu_cgroup_can_attach,
- .attach = cpu_cgroup_attach,
-- .legacy_cftypes = cpu_files,
-+ .legacy_cftypes = cpu_legacy_files,
- .early_init = 1,
- };
-
-diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
-index dd7cbb5..42b2dd5 100644
---- a/kernel/sched/cpuacct.c
-+++ b/kernel/sched/cpuacct.c
-@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
- return 0;
- }
-
--static const char * const cpuacct_stat_desc[] = {
-- [CPUACCT_STAT_USER] = "user",
-- [CPUACCT_STAT_SYSTEM] = "system",
--};
--
--static int cpuacct_stats_show(struct seq_file *sf, void *v)
-+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp)
- {
-- struct cpuacct *ca = css_ca(seq_css(sf));
- int cpu;
-- s64 val = 0;
-
-+ *userp = 0;
- for_each_online_cpu(cpu) {
- struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
-- val += kcpustat->cpustat[CPUTIME_USER];
-- val += kcpustat->cpustat[CPUTIME_NICE];
-+ *userp += kcpustat->cpustat[CPUTIME_USER];
-+ *userp += kcpustat->cpustat[CPUTIME_NICE];
- }
-- val = cputime64_to_clock_t(val);
-- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val);
-
-- val = 0;
-+ *sysp = 0;
- for_each_online_cpu(cpu) {
- struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu);
-- val += kcpustat->cpustat[CPUTIME_SYSTEM];
-- val += kcpustat->cpustat[CPUTIME_IRQ];
-- val += kcpustat->cpustat[CPUTIME_SOFTIRQ];
-+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM];
-+ *sysp += kcpustat->cpustat[CPUTIME_IRQ];
-+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ];
- }
-+}
-
-- val = cputime64_to_clock_t(val);
-- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val);
-+static int cpuacct_stats_show(struct seq_file *sf, void *v)
-+{
-+ cputime64_t user, sys;
-
-+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys);
-+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user));
-+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys));
- return 0;
- }
-
-
-commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97
-Author: Tejun Heo
-Date: Fri Mar 11 07:31:23 2016 -0500
-
- sched: Implement interface for cgroup unified hierarchy
-
- While the cpu controller doesn't have any functional problems, there
- are a couple interface issues which can be addressed in the v2
- interface.
-
- * cpuacct being a separate controller. This separation is artificial
- and rather pointless as demonstrated by most use cases co-mounting
- the two controllers. It also forces certain information to be
- accounted twice.
-
- * Use of different time units. Writable control knobs use
- microseconds, some stat fields use nanoseconds while other cpuacct
- stat fields use centiseconds.
-
- * Control knobs which can't be used in the root cgroup still show up
- in the root.
-
- * Control knob names and semantics aren't consistent with other
- controllers.
-
- This patchset implements cpu controller's interface on the unified
- hierarchy which adheres to the controller file conventions described
- in Documentation/cgroups/unified-hierarchy.txt. Overall, the
- following changes are made.
-
- * cpuacct is implictly enabled and disabled by cpu and its information
- is reported through "cpu.stat" which now uses microseconds for all
- time durations. All time duration fields now have "_usec" appended
- to them for clarity. While this doesn't solve the double accounting
- immediately, once majority of users switch to v2, cpu can directly
- account and report the relevant stats and cpuacct can be disabled on
- the unified hierarchy.
-
- Note that cpuacct.usage_percpu is currently not included in
- "cpu.stat". If this information is actually called for, it can be
- added later.
-
- * "cpu.shares" is replaced with "cpu.weight" and operates on the
- standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000).
- The weight is scaled to scheduler weight so that 100 maps to 1024
- and the ratio relationship is preserved - if weight is W and its
- scaled value is S, W / 100 == S / 1024. While the mapped range is a
- bit smaller than the orignal scheduler weight range, the dead zones
- on both sides are relatively small and covers wider range than the
- nice value mappings. This file doesn't make sense in the root
- cgroup and isn't create on root.
-
- * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max"
- which contains both quota and period.
-
- * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by
- "cpu.rt.max" which contains both runtime and period.
-
- v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for
- CFS bandwidth stats and also using raw division for u64. Use
- CONFIG_CFS_BANDWITH and do_div() instead.
-
- The semantics of "cpu.rt.max" is not fully decided yet. Dropped
- for now.
-
- Signed-off-by: Tejun Heo
- Cc: Ingo Molnar
- Cc: Peter Zijlstra
- Cc: Li Zefan
- Cc: Johannes Weiner
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 77f3ddd..7aafe63 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = {
- { } /* terminate */
- };
-
-+static int cpu_stats_show(struct seq_file *sf, void *v)
-+{
-+ cpuacct_cpu_stats_show(sf);
-+
-+#ifdef CONFIG_CFS_BANDWIDTH
-+ {
-+ struct task_group *tg = css_tg(seq_css(sf));
-+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
-+ u64 throttled_usec;
-+
-+ throttled_usec = cfs_b->throttled_time;
-+ do_div(throttled_usec, NSEC_PER_USEC);
-+
-+ seq_printf(sf, "nr_periods %d\n"
-+ "nr_throttled %d\n"
-+ "throttled_usec %llu\n",
-+ cfs_b->nr_periods, cfs_b->nr_throttled,
-+ throttled_usec);
-+ }
-+#endif
-+ return 0;
-+}
-+
-+#ifdef CONFIG_FAIR_GROUP_SCHED
-+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css,
-+ struct cftype *cft)
-+{
-+ struct task_group *tg = css_tg(css);
-+ u64 weight = scale_load_down(tg->shares);
-+
-+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024);
-+}
-+
-+static int cpu_weight_write_u64(struct cgroup_subsys_state *css,
-+ struct cftype *cftype, u64 weight)
-+{
-+ /*
-+ * cgroup weight knobs should use the common MIN, DFL and MAX
-+ * values which are 1, 100 and 10000 respectively. While it loses
-+ * a bit of range on both ends, it maps pretty well onto the shares
-+ * value used by scheduler and the round-trip conversions preserve
-+ * the original value over the entire range.
-+ */
-+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX)
-+ return -ERANGE;
-+
-+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL);
-+
-+ return sched_group_set_shares(css_tg(css), scale_load(weight));
-+}
-+#endif
-+
-+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf,
-+ long period, long quota)
-+{
-+ if (quota < 0)
-+ seq_puts(sf, "max");
-+ else
-+ seq_printf(sf, "%ld", quota);
-+
-+ seq_printf(sf, " %ld\n", period);
-+}
-+
-+/* caller should put the current value in *@periodp before calling */
-+static int __maybe_unused cpu_period_quota_parse(char *buf,
-+ u64 *periodp, u64 *quotap)
-+{
-+ char tok[21]; /* U64_MAX */
-+
-+ if (!sscanf(buf, "%s %llu", tok, periodp))
-+ return -EINVAL;
-+
-+ *periodp *= NSEC_PER_USEC;
-+
-+ if (sscanf(tok, "%llu", quotap))
-+ *quotap *= NSEC_PER_USEC;
-+ else if (!strcmp(tok, "max"))
-+ *quotap = RUNTIME_INF;
-+ else
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+#ifdef CONFIG_CFS_BANDWIDTH
-+static int cpu_max_show(struct seq_file *sf, void *v)
-+{
-+ struct task_group *tg = css_tg(seq_css(sf));
-+
-+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg));
-+ return 0;
-+}
-+
-+static ssize_t cpu_max_write(struct kernfs_open_file *of,
-+ char *buf, size_t nbytes, loff_t off)
-+{
-+ struct task_group *tg = css_tg(of_css(of));
-+ u64 period = tg_get_cfs_period(tg);
-+ u64 quota;
-+ int ret;
-+
-+ ret = cpu_period_quota_parse(buf, &period, "a);
-+ if (!ret)
-+ ret = tg_set_cfs_bandwidth(tg, period, quota);
-+ return ret ?: nbytes;
-+}
-+#endif
-+
-+static struct cftype cpu_files[] = {
-+ {
-+ .name = "stat",
-+ .flags = CFTYPE_NOT_ON_ROOT,
-+ .seq_show = cpu_stats_show,
-+ },
-+#ifdef CONFIG_FAIR_GROUP_SCHED
-+ {
-+ .name = "weight",
-+ .flags = CFTYPE_NOT_ON_ROOT,
-+ .read_u64 = cpu_weight_read_u64,
-+ .write_u64 = cpu_weight_write_u64,
-+ },
-+#endif
-+#ifdef CONFIG_CFS_BANDWIDTH
-+ {
-+ .name = "max",
-+ .flags = CFTYPE_NOT_ON_ROOT,
-+ .seq_show = cpu_max_show,
-+ .write = cpu_max_write,
-+ },
-+#endif
-+ { } /* terminate */
-+};
-+
- struct cgroup_subsys cpu_cgrp_subsys = {
- .css_alloc = cpu_cgroup_css_alloc,
- .css_free = cpu_cgroup_css_free,
-@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = {
- .can_attach = cpu_cgroup_can_attach,
- .attach = cpu_cgroup_attach,
- .legacy_cftypes = cpu_legacy_files,
-+ .dfl_cftypes = cpu_files,
- .early_init = 1,
-+#ifdef CONFIG_CGROUP_CPUACCT
-+ /*
-+ * cpuacct is enabled together with cpu on the unified hierarchy
-+ * and its stats are reported through "cpu.stat".
-+ */
-+ .depends_on = 1 << cpuacct_cgrp_id,
-+#endif
- };
-
- #endif /* CONFIG_CGROUP_SCHED */
-diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
-index 42b2dd5..b4d32a6 100644
---- a/kernel/sched/cpuacct.c
-+++ b/kernel/sched/cpuacct.c
-@@ -224,6 +224,30 @@ static struct cftype files[] = {
- { } /* terminate */
- };
-
-+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */
-+void cpuacct_cpu_stats_show(struct seq_file *sf)
-+{
-+ struct cgroup_subsys_state *css;
-+ u64 usage, user, sys;
-+
-+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys);
-+
-+ usage = cpuusage_read(css, seq_cft(sf));
-+ cpuacct_stats_read(css_ca(css), &user, &sys);
-+
-+ user *= TICK_NSEC;
-+ sys *= TICK_NSEC;
-+ do_div(usage, NSEC_PER_USEC);
-+ do_div(user, NSEC_PER_USEC);
-+ do_div(sys, NSEC_PER_USEC);
-+
-+ seq_printf(sf, "usage_usec %llu\n"
-+ "user_usec %llu\n"
-+ "system_usec %llu\n", usage, user, sys);
-+
-+ css_put(css);
-+}
-+
- /*
- * charge this task's execution time to its accounting group.
- *
-diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h
-index ed60562..44eace9 100644
---- a/kernel/sched/cpuacct.h
-+++ b/kernel/sched/cpuacct.h
-@@ -2,6 +2,7 @@
-
- extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);
- extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);
-+extern void cpuacct_cpu_stats_show(struct seq_file *sf);
-
- #else
-
-@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val)
- {
- }
-
-+static inline void cpuacct_cpu_stats_show(struct seq_file *sf)
-+{
-+}
-+
- #endif
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 85b5532db8..4336e6297f 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.269";
+ version = "4.14.270";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3";
+ sha256 = "17fj5aif5f0z0xgb321ghpv5p6drqxz0w948dr4hql4cj193r2zv";
};
} // (args.argsOverride or {}))
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 0d3aabde31..ff3b8ea22b 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.232";
+ version = "4.19.233";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg";
+ sha256 = "0dyf1xapmhly9gpygyjzj5yhn6s5xb0gss033sgllwn243q6bxmq";
};
} // (args.argsOverride or {}))
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
deleted file mode 100644
index 9271aa0182..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
-
-buildLinux (args // rec {
- version = "4.4.302";
- extraMeta.branch = "4.4";
- extraMeta.broken = stdenv.isAarch64;
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1cvnydc7y5xrb1c4yfmsl846dd1jfrr7xf62gxbhnkk01fs7n09m";
- };
-} // (args.argsOverride or {}))
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 920128b904..1a8be19098 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,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.304";
+ version = "4.9.305";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "099bkypbkb8an8jsl49f83kg6ic1yw9ssfc1qksaji1jparlnpi9";
+ sha256 = "0yspfrqlgpsa3a591bk9c2xqq5xf70lqfgj8wrnhd42agfxanr8k";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
index f5fb414481..07061ec05b 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.103";
+ version = "5.10.104";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g";
+ sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 472b1f58d3..b1a0b1bdcf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.26";
+ version = "5.15.27";
# 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;
@@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq";
+ sha256 = "01ksvmcwljzphbdll0pd9zg8ys8jy5xy29b54pxqjs3wq3n8zj9k";
};
} // (args.argsOverride or { }))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix
index e7c755d682..43aca96805 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.16.12";
+ version = "5.16.13";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1wnpn5w0rfniy60m2a25wjm3flvpzvs2z1s4ga01b9qhbbqisnmv";
+ sha256 = "1fvz4v3mcm9yxfak6mshl764piadgz46y71wprb85b1shc09i2ig";
};
} // (args.argsOverride or { }))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index b99c51e8e0..f9e6554239 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.182";
+ version = "5.4.183";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
+ sha256 = "17691h1575spgwh88mk189ars6gyjcl9nnaz585l2da8civhnjrd";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index bb789797a5..c1534838b7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.4.177-rt69"; # updated by ./update-rt.sh
+ version = "5.4.182-rt70"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "0wvb5is8rqvfxia1i8lw4yd3fm2bhb6wdl0bdjq90dx7y46wpxqq";
+ sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "16m1swkg54cgcgqwl6vifbpfvdf7waigbwi9brafwplb965zq5a2";
+ sha256 = "193glhb0bkaa7qggkj2vpp3r6avf0sh8fasj8byww7xwkhm7cncq";
};
}; in [ rt-patch ] ++ kernelPatches;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
index 1432eb5598..d990d6d4ed 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
- modDirVersion = "5.16.8-zen1";
+ modDirVersion = "5.16.11-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
- sha256 = "sha256-/CYPuj+P5KlYFur0X2FYrrJFUDhKVL7xm53uOSym+Rc=";
+ sha256 = "sha256-aCmHtWTOlFo9r6g0pcOXMzksAH3spcOqElE9hynFbFo=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix
index 1476ae4900..72f91e89c7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ flex ]
++ lib.optional stdenv.buildPlatform.isDarwin gettext;
- buildInputs = [ cracklib db4 audit ]
+ buildInputs = [ cracklib db4 ]
+ ++ lib.optional stdenv.buildPlatform.isLinux audit
++ lib.optional withLibxcrypt libxcrypt;
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix
index 1e4e00f959..1c2f0621b5 100644
--- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix
+++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix
@@ -1,19 +1,19 @@
{ fetchurl, fetchzip }:
{
"x86_64-darwin" = fetchzip {
- sha256 = "sha256-mKCqFMkTei7n/eI9s3aiAKc4jdnRA121TOizRHON1ic==";
- url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_darwin_amd64.zip";
+ sha256 = "sha256-bTbjkBHOjcI78+jyJJ1JGe/WrmTxXi5RRB1yQO2zuYw=";
+ url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_darwin_amd64.zip";
};
"i686-linux" = fetchurl {
- sha256 = "sha256-N+S2BWUskEHt5YjpncmiurdgQ6TN35TWN8Zv7bM3a5k=";
- url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_386.tar.gz";
+ sha256 = "sha256-wdzj7P+Hhm65i5hY4l2Ty486W473coZyZnCbzx9Poro=";
+ url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_386.tar.gz";
};
"x86_64-linux" = fetchurl {
- sha256 = "sha256-p665fB2lVSLpWIYlTNW+ZGOohpobdvOs0AIQ1l9BlmE=";
- url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_amd64.tar.gz";
+ sha256 = "sha256-sZQe8rNYD0gBSpNeXS+4hbqoT5nUFbkQSI3c6VuQOC8=";
+ url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_amd64.tar.gz";
};
"aarch64-linux" = fetchurl {
- sha256 = "sha256-oomkIHeQDTNDp6A6CcMv2s89PkuKpGVV4iLCxcj0Xsc=";
- url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_arm64.tar.gz";
+ sha256 = "sha256-9JsGzFf03en2ClrodglREsYqrwr6j/vypsfEVaMzCTI=";
+ url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_arm64.tar.gz";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix
index 0425116934..03d2b2ec96 100644
--- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "adguardhome";
- version = "0.107.4";
+ version = "0.107.5";
src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system};
diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix
index 9b2e9e20dd..240769bfe0 100644
--- a/third_party/nixpkgs/pkgs/servers/consul/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.11.3";
+ version = "1.11.4";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "sha256-kIV6XMicvBdtNOt3BJsOK/KZO3zQLuPgastMVoY8jM8=";
+ sha256 = "sha256-dQwJ3HzzYxolGrjgHXBElDZO65uXJKEv8UH5sYZ4swc=";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- vendorSha256 = "sha256-7oQGoMR7woN2RaEMCap9OWJdtGL4MvLN+FTKLqJHsCk=";
+ vendorSha256 = "sha256-VB7agtH6V7mJU689bFXuhi82qqzGxY16vFOPFBd/DQc=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix
index 3d92b2cd4b..b1c0f1424d 100644
--- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
- version = "0.5.1";
+ version = "0.6.5";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
- sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k=";
+ sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y=";
};
- vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I=";
+ vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A=";
passthru.tests = {
inherit (nixosTests) dendrite;
diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/servers/dex/default.nix
index 16dc5f8baf..c93f731630 100644
--- a/third_party/nixpkgs/pkgs/servers/dex/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dex/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dex";
- version = "2.30.0";
+ version = "2.31.0";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Z/X9Db57eNUJdjzLCJNIW3lCRw05JP2TQ43PqKO6CiI=";
+ sha256 = "sha256-tr7rs2ymHpMEtNwvLhgEzp94wO/k/oY814NS0N4ONsg=";
};
- vendorSha256 = "sha256-ksN/1boBQVhevlDseVZsGUWL+Bwy4AMgGNdOPgsNNxk=";
+ vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg=";
subPackages = [
"cmd/dex"
diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
index 5aa702e28d..2601266f4d 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchurl, fetchpatch
, perl, pkg-config
-, libcap, libtool, libxml2, openssl, libuv
+, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc
, enableGSSAPI ? true, libkrb5
, enablePython ? false, python3
, enableSeccomp ? false, libseccomp
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.16.25";
+ version = "9.18.0";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-n6MohQ+ChD74t78f9TIstosRAnOjPzdbpB81Jw9eH/M=";
+ sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ perl pkg-config ];
- buildInputs = [ libtool libxml2 openssl libuv ]
+ buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ]
++ lib.optional stdenv.isLinux libcap
++ lib.optional enableSeccomp libseccomp
++ lib.optional enableGSSAPI libkrb5
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
"--with-aes"
] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}"
++ lib.optional enableSeccomp "--enable-seccomp"
- ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}"
+ ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config"
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)";
postInstall = ''
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
passthru.tests = { inherit (nixosTests) bind; };
meta = with lib; {
- homepage = "https://www.isc.org/downloads/bind/";
+ homepage = "https://www.isc.org/bind/";
description = "Domain name server";
license = licenses.mpl20;
diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
index 89c5822657..b1677da434 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
+++ b/third_party/nixpkgs/pkgs/servers/dns/bind/dont-keep-configure-flags.patch
@@ -2,38 +2,38 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals
index 82b632ef04..dedfd4d33b 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
-@@ -71,7 +71,9 @@ EXTERN const char *named_g_version INIT(VERSION);
- EXTERN const char *named_g_product INIT(PRODUCT);
- EXTERN const char *named_g_description INIT(DESCRIPTION);
- EXTERN const char *named_g_srcid INIT(SRCID);
+@@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION);
+ EXTERN const char *named_g_product INIT(PACKAGE_NAME);
+ EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION);
+ EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID);
+#if 0
- EXTERN const char *named_g_configargs INIT(CONFIGARGS);
+ EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS);
+#endif
- EXTERN const char *named_g_builder INIT(BUILDER);
- EXTERN in_port_t named_g_port INIT(0);
- EXTERN isc_dscp_t named_g_dscp INIT(-1);
+ EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER);
+ EXTERN in_port_t named_g_port INIT(0);
+ EXTERN in_port_t named_g_tlsport INIT(0);
diff --git a/bin/named/main.c b/bin/named/main.c
index 9ad2d0e277..9729a2b3fc 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
-@@ -521,7 +521,9 @@ printversion(bool verbose) {
+@@ -481,7 +481,9 @@ printversion(bool verbose) {
}
printf("running on %s\n", named_os_uname());
+#if 0
- printf("built by %s with %s\n", named_g_builder, named_g_configargs);
+ printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS);
+#endif
#ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__);
#else /* ifdef __clang__ */
-@@ -1089,9 +1091,11 @@ setup(void) {
+@@ -1027,9 +1029,11 @@ setup(void) {
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",
named_os_uname());
+#if 0
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",
- named_g_configargs);
+ PACKAGE_CONFIGARGS);
+#endif
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch b/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch
new file mode 100644
index 0000000000..7929eeee08
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 963e40e..fb76d78 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -230,7 +230,7 @@ dependencies = [
+
+ [[package]]
+ name = "fishnet"
+-version = "2.5.1-dev"
++version = "2.5.1"
+ dependencies = [
+ "arrayvec",
+ "atty",
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
index 784a552513..10695e5478 100644
--- a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
@@ -6,21 +6,21 @@
}:
let
- nnueFile = "nn-6762d36ad265.nnue";
+ nnueFile = "nn-13406b1dcbe0.nnue";
nnue = fetchurl {
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
- sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7";
+ sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28=";
};
in
rustPlatform.buildRustPackage rec {
pname = "fishnet";
- version = "2.4.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps=";
+ sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c=";
fetchSubmodules = true;
};
@@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec {
cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}'
'';
- cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc=";
+ cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so=";
+
+ # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in
+ # the next update.
+ cargoPatches = [
+ ./Cargo.lock.patch
+ ];
meta = with lib; {
description = "Distributed Stockfish analysis for lichess.org";
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 472fa630ba..f12dcb87fb 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 = "2022.3.1";
+ version = "2022.3.3";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index 22a253e650..2bb6216154 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -158,7 +158,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2022.3.1";
+ hassVersion = "2022.3.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -176,7 +176,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-bihb6DL8hQuRnJZp39Lh2qfTXr0tFxn7FHFZewttNOc=";
+ hash = "sha256-qe9/VFcEBDfSa7AYrkmj1b6UGLHcm7CtLHiPwzZz8jg=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index d65ee309d2..9bfa5cf2f3 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ 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 = "20220301.0";
+ version = "20220301.1";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- sha256 = "sha256-Gshw8GIiZfFHmldvxBhUKZ5NFWuBIA6ug7m7eEfQ+ao=";
+ sha256 = "sha256-+S888lUHbWqEJQm5HvZqimTfqoDEHYRVAoGQ5UvU4u4=";
};
# there is nothing to strip in this package
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
index ee36216686..f4b5bf65fe 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, openssl_3_0, ... }@args:
callPackage ./generic.nix (args // { openssl = openssl_3_0; }) {
- version = "1.21.5";
- sha256 = "sha256-sg879TOlGKbw86eWff7thy0mjTHkzBIaAAEylgLdz7s=";
+ version = "1.21.6";
+ sha256 = "1bh52jqqcaj5wlh2kvhxr00jhk2hnk8k97ki4pwyj4c8920p1p36";
}
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
index b159cc00aa..2b8e2ac7f7 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
@@ -256,6 +256,7 @@ in
sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII=";
};
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
+ disableIPC = true;
};
moreheaders = {
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix
index f0a7a36755..4db1b19644 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix
@@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
- rev = "6f8253673669"; # branch=quic
- sha256 = "sha256:0zl4rws07vr8z7ml7sqlb70v3cx1cms7iablndqd38iqcx0bvjrq";
+ rev = "55b38514729b"; # branch=quic
+ sha256 = "sha256-EJ3Fuxb4Z43I5eSb3mzzIOBfppAZ4Adv1yVZWbVCv0A=";
};
preConfigure = ''
@@ -19,5 +19,5 @@ callPackage ./generic.nix args {
"--with-stream_quic_module"
];
- version = "1.21.5-quic";
+ version = "1.21.7-quic";
}
diff --git a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix
index 7a0d75dab2..4a6adb2b02 100644
--- a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "icingaweb2";
- version = "2.9.5";
+ version = "2.9.6";
src = fetchFromGitHub {
owner = "Icinga";
repo = "icingaweb2";
rev = "v${version}";
- sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8=";
+ sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
index 99a0187e1d..865c4490a0 100644
--- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.663";
+ version = "0.20.671";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "ZlKjuY3zHciImprDpaiBMnTJZtiegTpjhBcXe4LuYrQ=";
+ sha256 = "AoOaBryZHkqp5SabfKeW5E1YoJCwGhg2luK8SQvabow=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix
index 598946037d..11da56c6eb 100644
--- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "maddy";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchFromGitHub {
owner = "foxcpp";
repo = "maddy";
rev = "v${version}";
- sha256 = "sha256-UB9Y2nNkiN0L3NIfUqnpaJJqNuAnCYIeEyS60TnnIRs=";
+ sha256 = "sha256-FWoPAb/aHaQLxT+UUUoViCmLvauVuAzUyOmRNB8F72U=";
};
- vendorSha256 = "sha256-lL9hlICc9t/2v6eawG8LU6hpAKpY7raTg5l1RagewPs=";
+ vendorSha256 = "sha256-rcHboPfs2mWg3sgsLmN1IPoppmuDcsx0bQICp6EzYsQ=";
ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
index 1ae541cdf8..e6ec006333 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }:
stdenv.mkDerivation rec {
pname = "dovecot-fts-xapian";
- version = "1.5.4";
+ version = "1.5.4b";
src = fetchFromGitHub {
owner = "grosjo";
repo = "fts-xapian";
rev = version;
- sha256 = "sha256-3vrcaBsarJNECwfzUOrUnjD555E2dgbFiiEJR5bN3qM=";
+ sha256 = "sha256-RzwJjcUgk1XXQZpNdz86Pr9HsUaQCOSt5oSejnGVmgA=";
};
buildInputs = [ dovecot xapian icu64 sqlite ];
diff --git a/third_party/nixpkgs/pkgs/servers/mapcache/default.nix b/third_party/nixpkgs/pkgs/servers/mapcache/default.nix
index ff502d2032..744a529496 100644
--- a/third_party/nixpkgs/pkgs/servers/mapcache/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mapcache/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "mapcache";
- version = "1.10.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "MapServer";
repo = pname;
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
- sha256 = "sha256-HrvcJAf0a6tu8AKKuW5TaCtqPMgzH21fGMBxIfUzdgY=";
+ sha256 = "sha256-13lOQC4PJtByhvceuF00uoipLFHrFiyJrsy2iWcEANc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
index 578c5ec722..f23275d1df 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix
@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.53.0";
+ version = "1.54.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3";
+ sha256 = "sha256-TmUu6KpL111mjd4Dgm/kYnKpDZjw9rWrpMQ5isXmWRo=";
};
buildInputs = [ openssl ];
diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
index 58b19586e4..014460ab23 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
+++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
@@ -1,41 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }:
+{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }:
buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "v${version}";
- sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
+ sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
};
- patches = [
- # Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules.
- (fetchpatch {
- url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch";
- sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4=";
- stripLen = 1;
- })
- # Port to Synapse module API (needs Synapse >= 1.37.0)
- (fetchpatch {
- url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch";
- sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo=";
- stripLen = 1;
- excludes = [
- "README.md"
- "mx-tester.yml"
- ];
- })
- # Move glob_to_regex into the source
- (fetchpatch {
- url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch";
- sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk=";
- stripLen = 1;
- })
- ];
-
sourceRoot = "./source/synapse_antispam";
propagatedBuildInputs = [ matrix-synapse ];
diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix
index 57a554ff58..fa1133b7d5 100644
--- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix
@@ -2,7 +2,7 @@
let
pname = "miniflux";
- version = "2.0.35";
+ version = "2.0.36";
in buildGoModule {
inherit pname version;
@@ -11,10 +11,10 @@ in buildGoModule {
owner = pname;
repo = "v2";
rev = version;
- sha256 = "sha256-tOainlvEB0O6yMzIm0df4r8D68swtjXBFUDsPcNc3uA=";
+ sha256 = "sha256-Ly4Ep+ZyjEb1ywXO/W1P1ZDvqSAtJY4wuE8n9jbbeuU=";
};
- vendorSha256 = "sha256-dxtQAGlNOVO9NtuGbF6Nifa4QhnFGyHKhlDS3+V5HuM=";
+ vendorSha256 = "sha256-ZEIQeN7t9Az1W6T2Z+ZKHqs2O8UNNMl0nANM1mVyiTA=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
index cff0f88ba9..539ac38f4f 100644
--- a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "mjolnir";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "v${version}";
- sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
+ sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix
index 2a86815680..1454b69fc1 100644
--- a/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix
+++ b/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix
@@ -67,13 +67,13 @@ let
sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==";
};
};
- "@jest/types-27.4.2" = {
+ "@jest/types-27.5.1" = {
name = "_at_jest_slash_types";
packageName = "@jest/types";
- version = "27.4.2";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz";
- sha512 = "j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==";
+ url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz";
+ sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==";
};
};
"@selderee/plugin-htmlparser2-0.6.0" = {
@@ -103,6 +103,15 @@ let
sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==";
};
};
+ "@types/config-0.0.41" = {
+ name = "_at_types_slash_config";
+ packageName = "@types/config";
+ version = "0.0.41";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz";
+ sha512 = "HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA==";
+ };
+ };
"@types/connect-3.4.35" = {
name = "_at_types_slash_connect";
packageName = "@types/connect";
@@ -112,13 +121,13 @@ let
sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==";
};
};
- "@types/crypto-js-4.1.0" = {
+ "@types/crypto-js-4.1.1" = {
name = "_at_types_slash_crypto-js";
packageName = "@types/crypto-js";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.0.tgz";
- sha512 = "DCFfy/vh2lG6qHSGezQ+Sn2Ulf/1Mx51dqOdmOKyW5nMK3maLlxeS3onC7r212OnBM2pBR95HkAmAjjF08YkxQ==";
+ url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.1.tgz";
+ sha512 = "BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA==";
};
};
"@types/express-4.17.13" = {
@@ -139,6 +148,15 @@ let
sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==";
};
};
+ "@types/html-to-text-8.0.1" = {
+ name = "_at_types_slash_html-to-text";
+ packageName = "@types/html-to-text";
+ version = "8.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.0.1.tgz";
+ sha512 = "0B/OifmJYmk5r9z9+KJtGWOF0LEjbTN4D2QeCh+mAw81JkJwC83NvNWUZFEqRT5PpnjX7vX0ab1SMGcwCs3Lag==";
+ };
+ };
"@types/istanbul-lib-coverage-2.0.4" = {
name = "_at_types_slash_istanbul-lib-coverage";
packageName = "@types/istanbul-lib-coverage";
@@ -202,13 +220,13 @@ let
sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==";
};
};
- "@types/node-16.11.22" = {
+ "@types/node-16.11.25" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "16.11.22";
+ version = "16.11.25";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz";
- sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz";
+ sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ==";
};
};
"@types/parse5-6.0.3" = {
@@ -301,13 +319,13 @@ let
sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==";
};
};
- "accepts-1.3.7" = {
+ "accepts-1.3.8" = {
name = "accepts";
packageName = "accepts";
- version = "1.3.7";
+ version = "1.3.8";
src = fetchurl {
- url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
- sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+ url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
+ sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
};
};
"acorn-7.4.1" = {
@@ -373,13 +391,13 @@ let
sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
};
};
- "ajv-8.9.0" = {
+ "ajv-8.10.0" = {
name = "ajv";
packageName = "ajv";
- version = "8.9.0";
+ version = "8.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz";
- sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz";
+ sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==";
};
};
"ansi-colors-4.1.1" = {
@@ -571,13 +589,13 @@ let
sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
};
};
- "body-parser-1.19.1" = {
+ "body-parser-1.19.2" = {
name = "body-parser";
packageName = "body-parser";
- version = "1.19.1";
+ version = "1.19.2";
src = fetchurl {
- url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz";
- sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==";
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz";
+ sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
};
};
"brace-expansion-1.1.11" = {
@@ -634,13 +652,13 @@ let
sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
};
};
- "bytes-3.1.1" = {
+ "bytes-3.1.2" = {
name = "bytes";
packageName = "bytes";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz";
- sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==";
+ url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz";
+ sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==";
};
};
"callsites-3.1.0" = {
@@ -805,13 +823,13 @@ let
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
};
};
- "cookie-0.4.1" = {
+ "cookie-0.4.2" = {
name = "cookie";
packageName = "cookie";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
- sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
+ url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
+ sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
};
};
"cookie-signature-1.0.6" = {
@@ -1012,13 +1030,13 @@ let
sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==";
};
};
- "diff-sequences-27.4.0" = {
+ "diff-sequences-27.5.1" = {
name = "diff-sequences";
packageName = "diff-sequences";
- version = "27.4.0";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz";
- sha512 = "YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==";
+ url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz";
+ sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==";
};
};
"discontinuous-range-1.0.0" = {
@@ -1327,22 +1345,22 @@ let
sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
};
};
- "expect-27.4.6" = {
+ "expect-27.5.1" = {
name = "expect";
packageName = "expect";
- version = "27.4.6";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz";
- sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag==";
+ url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz";
+ sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==";
};
};
- "express-4.17.2" = {
+ "express-4.17.3" = {
name = "express";
packageName = "express";
- version = "4.17.2";
+ version = "4.17.3";
src = fetchurl {
- url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz";
- sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==";
+ url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz";
+ sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==";
};
};
"extend-3.0.2" = {
@@ -1579,13 +1597,13 @@ let
sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
};
};
- "globals-13.12.0" = {
+ "globals-13.12.1" = {
name = "globals";
packageName = "globals";
- version = "13.12.0";
+ version = "13.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz";
- sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==";
+ url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz";
+ sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==";
};
};
"graceful-fs-4.2.9" = {
@@ -1948,40 +1966,40 @@ let
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
};
};
- "jest-diff-27.4.6" = {
+ "jest-diff-27.5.1" = {
name = "jest-diff";
packageName = "jest-diff";
- version = "27.4.6";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz";
- sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==";
+ url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz";
+ sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==";
};
};
- "jest-get-type-27.4.0" = {
+ "jest-get-type-27.5.1" = {
name = "jest-get-type";
packageName = "jest-get-type";
- version = "27.4.0";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz";
- sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==";
+ url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz";
+ sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==";
};
};
- "jest-matcher-utils-27.4.6" = {
+ "jest-matcher-utils-27.5.1" = {
name = "jest-matcher-utils";
packageName = "jest-matcher-utils";
- version = "27.4.6";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz";
- sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==";
+ url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz";
+ sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==";
};
};
- "jest-message-util-27.4.6" = {
+ "jest-message-util-27.5.1" = {
name = "jest-message-util";
packageName = "jest-message-util";
- version = "27.4.6";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz";
- sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==";
+ url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz";
+ sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==";
};
};
"js-tokens-4.0.0" = {
@@ -2290,6 +2308,15 @@ let
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
};
};
+ "minimatch-3.1.2" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz";
+ sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
+ };
+ };
"minimist-1.2.5" = {
name = "minimist";
packageName = "minimist";
@@ -2317,13 +2344,13 @@ let
sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
};
};
- "mocha-9.2.0" = {
+ "mocha-9.2.1" = {
name = "mocha";
packageName = "mocha";
- version = "9.2.0";
+ version = "9.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz";
- sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz";
+ sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==";
};
};
"moo-0.5.1" = {
@@ -2380,6 +2407,15 @@ let
sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==";
};
};
+ "nanoid-3.3.1" = {
+ name = "nanoid";
+ packageName = "nanoid";
+ version = "3.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz";
+ sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
+ };
+ };
"natural-compare-1.4.0" = {
name = "natural-compare";
packageName = "natural-compare";
@@ -2398,13 +2434,13 @@ let
sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==";
};
};
- "negotiator-0.6.2" = {
+ "negotiator-0.6.3" = {
name = "negotiator";
packageName = "negotiator";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchurl {
- url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
- sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
+ sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
};
};
"normalize-path-3.0.0" = {
@@ -2650,13 +2686,13 @@ let
sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
};
};
- "pretty-format-27.4.6" = {
+ "pretty-format-27.5.1" = {
name = "pretty-format";
packageName = "pretty-format";
- version = "27.4.6";
+ version = "27.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz";
- sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==";
+ url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz";
+ sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==";
};
};
"progress-2.0.3" = {
@@ -2713,13 +2749,13 @@ let
sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
};
};
- "qs-6.9.6" = {
+ "qs-6.9.7" = {
name = "qs";
packageName = "qs";
- version = "6.9.6";
+ version = "6.9.7";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz";
- sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==";
+ url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz";
+ sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==";
};
};
"railroad-diagrams-1.0.0" = {
@@ -2758,13 +2794,13 @@ let
sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
};
};
- "raw-body-2.4.2" = {
+ "raw-body-2.4.3" = {
name = "raw-body";
packageName = "raw-body";
- version = "2.4.2";
+ version = "2.4.3";
src = fetchurl {
- url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz";
- sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==";
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz";
+ sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
};
};
"react-is-17.0.2" = {
@@ -2902,13 +2938,13 @@ let
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
- "sanitize-html-2.6.1" = {
+ "sanitize-html-2.7.0" = {
name = "sanitize-html";
packageName = "sanitize-html";
- version = "2.6.1";
+ version = "2.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.6.1.tgz";
- sha512 = "DzjSz3H5qDntD7s1TcWCSoRPmNR8UmA+y+xZQOvWgjATe2Br9ZW73+vD3Pj6Snrg0RuEuJdXgrKvnYuiuixRkA==";
+ url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz";
+ sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==";
};
};
"saxes-5.0.1" = {
@@ -3559,13 +3595,13 @@ let
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
};
};
- "ws-7.5.6" = {
+ "ws-7.5.7" = {
name = "ws";
packageName = "ws";
- version = "7.5.6";
+ version = "7.5.7";
src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz";
- sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==";
+ url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz";
+ sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==";
};
};
"xml-name-validator-3.0.0" = {
@@ -3662,8 +3698,8 @@ let
args = {
name = "mjolnir";
packageName = "mjolnir";
- version = "1.3.1";
- src = ../../../../../../../nix/store/k1myvl4f3yvjk9jw4d1b1k1rc8rlwcy2-source;
+ version = "1.3.2";
+ src = ../../../../../../../nix/store/yikp7bs3z15vp8rpaghdqc9kpngsfvyj-source;
dependencies = [
sources."@babel/code-frame-7.12.11"
sources."@babel/helper-validator-identifier-7.16.7"
@@ -3693,14 +3729,16 @@ let
];
})
sources."@humanwhocodes/object-schema-1.2.1"
- sources."@jest/types-27.4.2"
+ sources."@jest/types-27.5.1"
sources."@selderee/plugin-htmlparser2-0.6.0"
sources."@tootallnate/once-1.1.2"
sources."@types/body-parser-1.19.2"
+ sources."@types/config-0.0.41"
sources."@types/connect-3.4.35"
- sources."@types/crypto-js-4.1.0"
+ sources."@types/crypto-js-4.1.1"
sources."@types/express-4.17.13"
sources."@types/express-serve-static-core-4.17.28"
+ sources."@types/html-to-text-8.0.1"
sources."@types/istanbul-lib-coverage-2.0.4"
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-3.0.1"
@@ -3708,7 +3746,7 @@ let
sources."@types/json5-0.0.29"
sources."@types/mime-1.3.2"
sources."@types/mocha-9.1.0"
- sources."@types/node-16.11.22"
+ sources."@types/node-16.11.25"
sources."@types/parse5-6.0.3"
sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4"
@@ -3719,7 +3757,7 @@ let
sources."@types/yargs-parser-20.2.1"
sources."@ungap/promise-all-settled-1.1.2"
sources."abab-2.0.5"
- sources."accepts-1.3.7"
+ sources."accepts-1.3.8"
sources."acorn-8.7.0"
(sources."acorn-globals-6.0.0" // {
dependencies = [
@@ -3757,14 +3795,14 @@ let
sources."bcrypt-pbkdf-1.0.2"
sources."binary-extensions-2.2.0"
sources."bluebird-3.7.2"
- sources."body-parser-1.19.1"
+ sources."body-parser-1.19.2"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."browser-process-hrtime-1.0.0"
sources."browser-stdout-1.3.1"
sources."buffer-from-1.1.2"
sources."builtin-modules-1.1.1"
- sources."bytes-3.1.1"
+ sources."bytes-3.1.2"
sources."callsites-3.1.0"
sources."camelcase-6.3.0"
sources."caseless-0.12.0"
@@ -3780,7 +3818,7 @@ let
sources."config-3.3.7"
sources."content-disposition-0.5.4"
sources."content-type-1.0.4"
- sources."cookie-0.4.1"
+ sources."cookie-0.4.2"
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.2"
sources."cross-spawn-7.0.3"
@@ -3802,7 +3840,7 @@ let
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."diff-5.0.0"
- sources."diff-sequences-27.4.0"
+ sources."diff-sequences-27.5.1"
sources."discontinuous-range-1.0.0"
sources."doctrine-3.0.0"
sources."dom-serializer-1.3.2"
@@ -3866,8 +3904,8 @@ let
sources."estraverse-5.3.0"
sources."esutils-2.0.3"
sources."etag-1.8.1"
- sources."expect-27.4.6"
- sources."express-4.17.2"
+ sources."expect-27.5.1"
+ sources."express-4.17.3"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.3"
@@ -3893,7 +3931,7 @@ let
sources."glob-7.2.0"
sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.4.1"
- sources."globals-13.12.0"
+ sources."globals-13.12.1"
sources."graceful-fs-4.2.9"
sources."growl-1.10.5"
sources."har-schema-2.0.0"
@@ -3941,10 +3979,10 @@ let
sources."is-unicode-supported-0.1.0"
sources."isexe-2.0.0"
sources."isstream-0.1.2"
- sources."jest-diff-27.4.6"
- sources."jest-get-type-27.4.0"
- sources."jest-matcher-utils-27.4.6"
- (sources."jest-message-util-27.4.6" // {
+ sources."jest-diff-27.5.1"
+ sources."jest-get-type-27.5.1"
+ sources."jest-matcher-utils-27.5.1"
+ (sources."jest-message-util-27.5.1" // {
dependencies = [
sources."@babel/code-frame-7.16.7"
];
@@ -3983,17 +4021,19 @@ let
sources."mime-db-1.51.0"
sources."mime-types-2.1.34"
sources."minimalistic-assert-1.0.1"
- sources."minimatch-3.0.4"
+ sources."minimatch-3.1.2"
sources."minimist-1.2.5"
sources."mkdirp-1.0.4"
- (sources."mocha-9.2.0" // {
+ (sources."mocha-9.2.1" // {
dependencies = [
(sources."debug-4.3.3" // {
dependencies = [
sources."ms-2.1.2"
];
})
+ sources."minimatch-3.0.4"
sources."ms-2.1.3"
+ sources."nanoid-3.2.0"
sources."supports-color-8.1.1"
];
})
@@ -4004,10 +4044,10 @@ let
];
})
sources."ms-2.0.0"
- sources."nanoid-3.2.0"
+ sources."nanoid-3.3.1"
sources."natural-compare-1.4.0"
sources."nearley-2.20.1"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."normalize-path-3.0.0"
sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
@@ -4033,7 +4073,7 @@ let
sources."pify-3.0.0"
sources."postcss-8.4.6"
sources."prelude-ls-1.1.2"
- (sources."pretty-format-27.4.6" // {
+ (sources."pretty-format-27.5.1" // {
dependencies = [
sources."ansi-styles-5.2.0"
];
@@ -4043,12 +4083,12 @@ let
sources."pseudomap-1.0.2"
sources."psl-1.8.0"
sources."punycode-2.1.1"
- sources."qs-6.9.6"
+ sources."qs-6.9.7"
sources."railroad-diagrams-1.0.0"
sources."randexp-0.4.6"
sources."randombytes-2.1.0"
sources."range-parser-1.2.1"
- sources."raw-body-2.4.2"
+ sources."raw-body-2.4.3"
sources."react-is-17.0.2"
sources."readdirp-3.6.0"
sources."regexpp-3.2.0"
@@ -4073,7 +4113,7 @@ let
sources."rimraf-3.0.2"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."sanitize-html-2.6.1"
+ sources."sanitize-html-2.7.0"
sources."saxes-5.0.1"
sources."selderee-0.6.0"
sources."semver-7.3.5"
@@ -4112,7 +4152,7 @@ let
sources."symbol-tree-3.2.4"
(sources."table-6.8.0" // {
dependencies = [
- sources."ajv-8.9.0"
+ sources."ajv-8.10.0"
sources."json-schema-traverse-1.0.0"
];
})
@@ -4177,7 +4217,7 @@ let
sources."workerpool-6.2.0"
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
- sources."ws-7.5.6"
+ sources."ws-7.5.7"
sources."xml-name-validator-3.0.0"
sources."xmlchars-2.2.0"
sources."y18n-5.0.8"
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
index 38976521c0..1c24c065ed 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix
@@ -2,23 +2,28 @@
buildGoModule rec {
pname = "gitlab-ci-pipelines-exporter";
- version = "0.4.9";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "mvisonneau";
repo = pname;
rev = "v${version}";
- sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz";
+ sha256 = "1i0ry93w2pk8m7i4fbdn1xvsmvjn83d6lr6l7yywid9d0kmkjz13";
};
- vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa";
+ subPackages = [ "cmd/${pname}" ];
+ ldflags = [
+ "-X main.version=v${version}"
+ ];
+
+ vendorSha256 = "UszZaxql5sO4DSDVD/UIjeeDojCQEPF+ATL7O9MaTG8=";
doCheck = true;
meta = with lib; {
description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights";
homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter";
license = licenses.asl20;
- maintainers = [ maintainers.mmahut ];
+ maintainers = with maintainers; [ mmahut mvisonneau ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix
index 82bbe7b3a7..1f0395d2fb 100644
--- a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix
@@ -55,5 +55,6 @@ buildGoModule rec {
homepage = "https://www.pufferpanel.com/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ ckie ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pufferpanel.x86_64-darwin
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
index fe30163799..75e20ecef0 100644
--- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
@@ -9,14 +9,14 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
- x64-linux_hash = "sha256-2DZUQ11sAsIbI3hkU+6Hj+xHz3EbsTelisUCOlRBvvQ=";
- arm64-linux_hash = "sha256-j5gUC50NfvF2/W/aYgCiMoW1jF9F30L7pnVaFfX1Fwk=";
- x64-osx_hash = "sha256-iOaOzisG54+nstPNNUXOYwhEaM1Uh4wHPISVtEf8vTQ=";
+ x64-linux_hash = "sha256-4jzQ/bax323r4OzWwr9vq+6x0GasBZhRT+i6bDS/RMs=";
+ arm64-linux_hash = "sha256-IOFKlqey9biL8wCpbIxMnZZ5Svvrh6KMkNoZ7GBht3M=";
+ x64-osx_hash = "sha256-tdyEYY6qXNKjMPW652gtPAhTm/aNyTe+CgZ5aA9k2EM=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
- version = "4.0.4.5922";
+ version = "4.0.5.5981";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/servers/routinator/default.nix b/third_party/nixpkgs/pkgs/servers/routinator/default.nix
index cb2c68d6c2..2e5bd01721 100644
--- a/third_party/nixpkgs/pkgs/servers/routinator/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/routinator/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
- version = "0.10.2";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2";
+ sha256 = "sha256-GKn8JRgYXLkm5gX5Tv6lMdS7oFan2TF7dLqWK+nEeYg=";
};
- cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx";
+ cargoSha256 = "sha256-r3Np9aAJRZUj0TezZhT5cJJkm8EBjV9yQpplcrNgzmU=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
index a2d6d94d3b..fcab3a8e56 100644
--- a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sonarr";
- version = "3.0.6.1342";
+ version = "3.0.7.1477";
src = fetchurl {
url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz";
- sha256 = "sha256-6RMthsf60FJLDHB72QJkPeF7vXmjBgcqKujO0IOjVIk=";
+ sha256 = "sha256-xB7kWWxx+ymBxyxBzwY7gZfw9kMHi2MSsrUp8GIOiws=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix
index 74fddbd498..a1db051e7b 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
- version = "0.37.1";
+ version = "0.37.4";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
- sha256 = "sha256-rLnjWJPIf2SzWpaQxt/4zACihKptly/OJ+w0/uJBacY=";
+ sha256 = "sha256-cKX8idMmh9hQVPjO8rJWlp1nhtnzwwlLkelNw+LLBag=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- vendorSha256 = "sha256-YqlOzHsdkRrBdQ/mWGs2JIq5JttdRhFeug9HRbl6qlw=";
+ vendorSha256 = "sha256-vaYCo+jvw3qcLQ63oA8tq6G6Gxq50VTxK6IMBcEZXqs=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix
index ab244d282e..98b41f6cc1 100644
--- a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix
@@ -19,6 +19,8 @@ lib.makeScope newScope (self: with self; {
fzf-fish = callPackage ./fzf-fish.nix { };
+ hydro = callPackage ./hydro.nix { };
+
pisces = callPackage ./pisces.nix { };
pure = callPackage ./pure.nix { };
diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix
new file mode 100644
index 0000000000..efc85cfcd0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/hydro.nix
@@ -0,0 +1,20 @@
+{ lib, buildFishPlugin, fetchFromGitHub }:
+
+buildFishPlugin rec {
+ pname = "hydro";
+ version = "d4875065ceea226f58ead97dd9b2417937344d6e";
+
+ src = fetchFromGitHub {
+ owner = "jorgebucaran";
+ repo = "hydro";
+ rev = version;
+ sha256 = "sha256-nXeDnqqOuZyrqGTPEQtYlFvrFvy1bZVMF4CA37b0lsE=";
+ };
+
+ meta = with lib; {
+ description = "Ultra-pure, lag-free prompt with async Git status.";
+ homepage = "https://github.com/jorgebucaran/hydro`";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mrhedgehog ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix b/third_party/nixpkgs/pkgs/shells/hilbish/default.nix
index 55a28ceb88..08ee5d664f 100644
--- a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/hilbish/default.nix
@@ -2,19 +2,17 @@
buildGoModule rec {
pname = "hilbish";
- version = "0.7.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "Rosettea";
repo = "Hilbish";
rev = "v${version}";
- sha256 = "sha256-YQNLv6/4I5WM/xhlWIjThgO23tN+ZCyJVZVatnIUllc=";
+ sha256 = "sha256-BsN2v6OEWOtk8ENKr5G+lSmNIUA89VfpO+QQoBizx9g=";
fetchSubmodules = true;
};
- vendorSha256 = "sha256-xzB6sqBnDuvqTFMmLcXdSj6UFWYzA54PxUBKrFKhyQk=";
-
- buildInputs = [ readline ];
+ vendorSha256 = "sha256-Bmst1oJMuSXGvL8Syw6v2BqrbO5McHKkTufFs6iuxzs=";
ldflags = [
"-s"
@@ -28,7 +26,7 @@ buildGoModule rec {
cp .hilbishrc.lua $out/share/hilbish/
cp -r docs -t $out/share/hilbish
cp -r libs -t $out/share/hilbish/
- cp preload.lua $out/share/hilbish/
+ cp -r prelude/ $out/share/hilbish/
# segfaults and it's already been generated upstream
# we copy the docs over with the above cp command
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
index 07d72a6b43..538fbc0a52 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "grml-zsh-config";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
- sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs=";
+ sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM=";
};
buildInputs = [ zsh coreutils txt2tags procps ]
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
index 44caa6838e..40cedd713a 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix
@@ -19,16 +19,9 @@ let
allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];
blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [];
- onlyLicenses = list:
- lib.lists.all (license:
- let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
- if license == l then true else
- throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
- ) list;
-
areLicenseListsValid =
if lib.mutuallyExclusive allowlist blocklist then
- assert onlyLicenses allowlist; assert onlyLicenses blocklist; true
+ true
else
throw "allowlistedLicenses and blocklistedLicenses are not mutually exclusive.";
diff --git a/third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix b/third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
index 255d4c34e5..e8a959f6b4 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/skippy-xd/default.nix
@@ -1,6 +1,6 @@
{ lib
, stdenv
-, fetchgit
+, fetchFromGitHub
, xorgproto
, libX11
, libXft
@@ -12,7 +12,16 @@
, giflib
, pkg-config
}:
-let
+stdenv.mkDerivation rec {
+ pname = "skippy-xd";
+ version = "unstable-2015-03-01";
+ src = fetchFromGitHub {
+ owner = "richardgv";
+ repo = "skippy-xd";
+ rev = "397216ca67074c71314f5e9a6e3f1710ccabc29e";
+ sha256 = "sha256-iP6g3iS1aPPkauBLHbgZH/l+TXbWyIJ2TmbrSiNTkn0=";
+ };
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libX11
@@ -23,26 +32,15 @@ let
libXinerama
libjpeg
giflib
- pkg-config
];
-in
-stdenv.mkDerivation rec {
- version = "unstable-2015-03-01";
- pname = "skippy-xd";
- inherit buildInputs;
- src = fetchgit {
- url = "https://github.com/richardgv/skippy-xd/";
- rev = "397216ca67";
- sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8";
- };
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''
sed -e "s@/etc/xdg@$out&@" -i Makefile
'';
- meta = {
+ meta = with lib; {
description = "Expose-style compositing-based standalone window switcher";
- license = lib.licenses.gpl2Plus;
- maintainers = [ lib.maintainers.raskin ];
- platforms = lib.platforms.linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
index 2a2d55dc19..08fb92e4ea 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix
@@ -25,15 +25,7 @@ let
rev = "7083e5c204e139dc41f646e0ad85286b5e7c0c23";
sha256 = "sha256-aiCc/CXoTem0a9wI/AMBRK3g2BXJi7LpnUY/BxBEKVM=";
};
- propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt];
- });
-
- prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
- version = "2.0.10";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
- };
+ propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [ py.pkgs.awscrt ];
});
};
};
@@ -41,13 +33,13 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
- version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too
+ version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
- sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE=";
+ sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
index f7ba90ac2a..d17366b38a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "colmena";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "zhaofengli";
repo = "colmena";
rev = "v${version}";
- sha256 = "sha256-5UU8iBzwO7xM8B+LulnFkJFv5j5lu7mfq0XMmOCaKcQ=";
+ sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8=";
};
- cargoSha256 = "sha256-wMC2GAVVxkwrgJtOIJL0P+Uxh+ouW4VwLDrXJlD10AA=";
+ cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix
index 03cc557003..04f128e7bd 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.85.0";
+ version = "0.86.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-gkwFW9ikpdA5ErNGmkMMTRvWmRVw28vZF/SixsWnzNg=";
+ sha256 = "sha256-AvBfj3/dPq/iokuRBDQRh2b3g5KBH/oFBDEDaVwQ51A=";
};
- vendorSha256 = "sha256-as3Q8umRES/XncIZbV4UKZSGvzqHF7ClKBWvnGdkYeg=";
+ vendorSha256 = "sha256-bqyT6RXPBDPZt9ogS97G0jHJs7VdvVlHCXMaqJjnU2s=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
index ecab060ee9..529871683f 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.50.0";
+ version = "1.51.1";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-RpUnJzMnYIvPpJd6+IVpDxCS/FGM+PHXvbQPJQEoS8Y=";
+ sha256 = "sha256-NU4xJTW0KCi8PZAY4cRJijGHCZEn5Z41xNF7+iH01oo=";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix
index 71274be69a..f712c72fe0 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "fits-cloudctl";
- version = "0.10.9";
+ version = "0.10.10";
src = fetchFromGitHub {
owner = "fi-ts";
repo = "cloudctl";
rev = "v${version}";
- sha256 = "sha256-FNlbAxU1FiLl74h+BmpAB3+vZ+RgdlpkehsDLhpZ4EE=";
+ sha256 = "sha256-US3Wvr6uBwsaIqjsbWeZtYucXVybMjKu8AuPYvykCvA=";
};
vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o=";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
index 22b39ae123..d4d5ee7348 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
- version = "0.39.3";
+ version = "0.41.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-tPjODqBJ85B9uEFExs8z2T/RNKuIvphxX8U1tQLRr+A=";
+ sha256 = "sha256-6ltEC9LCuE4Rj4TlBwsDI45L92XMuCbEuMDkOk8OkZo=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
- vendorSha256 = "sha256-fHrKg1+9428feTv3wngV2EjJEUqE5ItbwFu7DxXmkCw=";
+ vendorSha256 = "sha256-13PcAQlHPaQ1n7OiRSEW5H3rDXgUAmKAQGqQM31iyR8=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 87b8940026..17f4d88484 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2022.02.13";
+ version = "2022.02.21";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- hash = "sha256-iPeGcEDGvltXqJY50B+yDKYKRF4Oz9GQifn7Pqe8dG8=";
+ hash = "sha256-oGGtJhVugqTvXD34Q2f8L5qoYoyyT5JjuBhqh4VYAAo=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
index ab56a9890b..15981b0fc6 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "audiowaveform";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "bbc";
repo = "audiowaveform";
rev = version;
- sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU=";
+ sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY=";
};
nativeBuildInputs = [ cmake gtest ];
diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
index 4ee8644d71..a7b0212a7b 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix
@@ -1,6 +1,7 @@
{ lib
, python3
, fetchFromGitHub
+, espeak-ng
}:
# USAGE:
@@ -30,14 +31,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "tts";
- version = "0.5.0";
+ version = "0.6.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
rev = "v${version}";
- sha256 = "sha256-9fNYNhHS9wqrk2bZnrkkGU1OaDu/16RA8fz+Zj9xsyQ=";
+ sha256 = "sha256-YzMR/Tl1UvjdSqV/h4lYR6DuarEqEIM7RReqYznFU4Q=";
};
postPatch = let
@@ -48,7 +49,7 @@ python.pkgs.buildPythonApplication rec {
"numba"
"numpy"
"umap-learn"
- "torch"
+ "unidic-lite"
];
in ''
sed -r -i \
@@ -65,6 +66,7 @@ python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python.pkgs; [
anyascii
coqpit
+ coqui-trainer
flask
fsspec
gdown
@@ -92,29 +94,19 @@ python.pkgs.buildPythonApplication rec {
];
postInstall = ''
- cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server
+ cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server
# cython modules are not installed for some reasons
(
cd TTS/tts/utils/monotonic_align
- ${python3.interpreter} setup.py install --prefix=$out
+ ${python.interpreter} setup.py install --prefix=$out
)
'';
- checkInputs = with python3.pkgs; [
- pytest-sugar
+ checkInputs = with python.pkgs; [
+ espeak-ng
pytestCheckHook
];
- disabledTests = [
- # RuntimeError: fft: ATen not compiled with MKL support
- "test_torch_stft"
- "test_stft_loss"
- "test_multiscale_stft_loss"
- # Requires network acccess to download models
- "test_synthesize"
- "test_run_all_models"
- ];
-
preCheck = ''
# use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules.
mv TTS{,.old}
@@ -125,22 +117,49 @@ python.pkgs.buildPythonApplication rec {
for file in $(grep -rl 'python TTS/bin' tests); do
substituteInPlace "$file" \
- --replace "python TTS/bin" "${python3.interpreter} $out/lib/${python3.libPrefix}/site-packages/TTS/bin"
+ --replace "python TTS/bin" "${python.interpreter} $out/lib/${python.libPrefix}/site-packages/TTS/bin"
done
'';
+ disabledTests = [
+ # Requires network acccess to download models
+ "test_synthesize"
+ "test_run_all_models"
+ # Mismatch between phonemes
+ "test_text_to_ids_phonemes_with_eos_bos_and_blank"
+ # Takes too long
+ "test_parametrized_wavernn_dataset"
+ ];
+
disabledTestPaths = [
- # requires tensorflow
- "tests/vocoder_tests/test_vocoder_tf_pqmf.py"
- "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py"
- "tests/tts_tests/test_tacotron2_tf_model.py"
- # RuntimeError: fft: ATen not compiled with MKL support
+ # phonemes mismatch between espeak-ng and gruuts phonemizer
+ "tests/text_tests/test_phonemizer.py"
+ # no training, it takes too long
+ "tests/aux_tests/test_speaker_encoder_train.py"
+ "tests/tts_tests/test_align_tts_train.py"
+ "tests/tts_tests/test_fast_pitch_speaker_emb_train.py"
+ "tests/tts_tests/test_fast_pitch_train.py"
+ "tests/tts_tests/test_glow_tts_d-vectors_train.py"
+ "tests/tts_tests/test_glow_tts_speaker_emb_train.py"
+ "tests/tts_tests/test_glow_tts_train.py"
+ "tests/tts_tests/test_speedy_speech_train.py"
+ "tests/tts_tests/test_tacotron2_d-vectors_train.py"
+ "tests/tts_tests/test_tacotron2_speaker_emb_train.py"
+ "tests/tts_tests/test_tacotron2_train.py"
+ "tests/tts_tests/test_tacotron2_train_fsspec_path.py"
+ "tests/tts_tests/test_tacotron_train.py"
+ "tests/tts_tests/test_vits_d-vectors_train.py"
+ "tests/tts_tests/test_vits_multilingual_speaker_emb_train.py"
+ "tests/tts_tests/test_vits_multilingual_train-d_vectors.py"
+ "tests/tts_tests/test_vits_speaker_emb_train.py"
"tests/tts_tests/test_vits_train.py"
+ "tests/vocoder_tests/test_wavegrad_train.py"
+ "tests/vocoder_tests/test_parallel_wavegan_train.py"
"tests/vocoder_tests/test_fullband_melgan_train.py"
"tests/vocoder_tests/test_hifigan_train.py"
- "tests/vocoder_tests/test_melgan_train.py"
"tests/vocoder_tests/test_multiband_melgan_train.py"
- "tests/vocoder_tests/test_parallel_wavegan_train.py"
+ "tests/vocoder_tests/test_melgan_train.py"
+ "tests/vocoder_tests/test_wavernn_train.py"
];
meta = with lib; {
@@ -148,6 +167,6 @@ python.pkgs.buildPythonApplication rec {
changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}";
description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production";
license = licenses.mpl20;
- maintainers = with maintainers; [ hexa mic92 ];
+ maintainers = teams.tts.members;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix
index 1eac3f0432..09f17b9a2b 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kopia";
- version = "0.10.5";
+ version = "0.10.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-9H57NlvyEEOX2F3ooWWqDAo7MnS9J+XrYv/cIyNo6+Y=";
+ sha256 = "sha256-lyCTKjimVZkpXKVeDNn0e9E6FkDp7fUl3cYnn5W5A7o=";
};
- vendorSha256 = "sha256-c8WohMyaOicPq2q+DkgNBBulMEJCZFNFe+xECUEpelI=";
+ vendorSha256 = "sha256-p+hK662WoO98J/uE3B9X1GvpnyMGu21sAg8GcyTlWZM=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
index 9f2a52d64d..699343b872 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
@@ -2,19 +2,20 @@
buildGoModule rec {
pname = "restic-rest-server";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "restic";
repo = "rest-server";
rev = "v${version}";
- sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7";
+ hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds=";
};
- vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg";
+ vendorSha256 = "sha256-8x5qYvIX/C5BaewrTNVbIIadL+7XegbRUZiEDWmJM+c=";
preCheck = ''
- substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin"
+ substituteInPlace cmd/rest-server/main_test.go \
+ --replace "/tmp/restic" "/build/restic"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
index d630c7d43f..6fbc0b9b45 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo
, shared ? !stdenv.hostPlatform.isStatic
+, e2fsprogs, runCommand
}:
stdenv.mkDerivation rec {
@@ -65,6 +66,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ passthru.tests = {
+ simple-filesystem = runCommand "e2fsprogs-create-fs" {} ''
+ mkdir -p $out
+ truncate -s10M $out/disc
+ ${e2fsprogs}/bin/mkfs.ext4 $out/disc | tee $out/success
+ ${e2fsprogs}/bin/e2fsck -n $out/disc | tee $out/success
+ [ -e $out/success ]
+ '';
+ };
meta = with lib; {
homepage = "http://e2fsprogs.sourceforge.net/";
changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}";
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
index fbeac15a38..9b96f1c0a8 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
@@ -1,17 +1,17 @@
{ lib, rustPlatform, fetchFromGitea, testVersion, garage }:
rustPlatform.buildRustPackage rec {
pname = "garage";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitea {
domain = "git.deuxfleurs.fr";
owner = "Deuxfleurs";
repo = "garage";
rev = "v${version}";
- sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks=";
+ sha256 = "sha256-BEFxPU4yPtctN7H+EcxJpXnf4tyqBseskls0ZA9748k=";
};
- cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618=";
+ cargoSha256 = "sha256-/mOH7VOfIHEydnJUUSts44aGb8tS1/Faxiu4pQDeobY=";
passthru = {
tests.version = testVersion { package = garage; };
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix
index e87b96482c..b28f0a3666 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/ioztat/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ioztat";
- version = "1.1.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "jimsalterjrs";
repo = "ioztat";
rev = "v${version}";
- sha256 = "wDRcFlXmXTc1J9MQZqILfPp5jUhX6wW4nOnqspIWVjQ=";
+ sha256 = "sha256-8svMijgVxSuquPFO2Q2HeqGLdMkwhiujS1DSxC/LRRk=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -24,12 +24,15 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/bin
- cp ioztat $out/bin
+ runHook preInstall
+
+ install -vDt $out/bin -m 0555 ioztat
if [ -f ioztat.8 ]; then
installManPage ioztat.8
fi
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix
index 73ccd29ad5..1009125adc 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/lfs/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "lfs";
- version = "2.2.0";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-q8ekLh0pw+kMIE2SP3cBgrMTfMjY5zRWR58mq5bbB8U=";
+ sha256 = "sha256-ySaPR6it/1xEf+Rnypnz5AklxWZZ8NeXpjId4ZSMIs8=";
};
- cargoSha256 = "sha256-eZM48OyYgEJl71I2iu52hKwjDrbSelR4JH/se79bBDs=";
+ cargoSha256 = "sha256-FLbFDJXVpWycII8mdNDphh8QVXFFnxtFgloweW+BZA0=";
meta = with lib; {
description = "Get information on your mounted disks";
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
index 0cafb0c83f..949b8c92f8 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mtools";
- version = "4.0.37";
+ version = "4.0.38";
src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
- sha256 = "sha256-eZsZfiPke2ElliiBCyd5Dvt6H+NgN+8dqKJ7CuT6g0I=";
+ sha256 = "sha256-e5RIX0huffCMymiwChZKE8049MY8uGhNGIdZ7nvF5yk=";
};
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
index aefa2c3f78..1dc47e4287 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
desktopItems = [(makeDesktopItem {
name = "agi";
desktopName = "Android GPU Inspector";
- exec = "$out/bin/agi";
+ exec = "agi";
icon = "agi";
categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ];
})];
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix
index a982d329f9..cecc52b9df 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix
@@ -31,13 +31,13 @@ with rec {
gccStdenv.mkDerivation rec {
pname = "astc-encoder";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "astc-encoder";
rev = version;
- sha256 = "sha256-5E26QzphF5HwVTH+92S4rT3IUAp9ravT/wxsmaH9IAM=";
+ sha256 = "sha256-blOfc/H64UErjPjkdZQNp2H/Hw57RbQRFBcUo/C2b0Q=";
};
nativeBuildInputs = [ cmake ];
@@ -46,6 +46,12 @@ gccStdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Release"
];
+ # Set a fixed build year to display within help output (otherwise, it would be 1980)
+ postPatch = ''
+ substituteInPlace Source/cmake_core.cmake \
+ --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")'
+ '';
+
# Link binaries into environment and provide 'astcenc' link
postInstall = ''
mv $out/astcenc $out/bin
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix
index b48c0a6d16..7486a885a5 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/snapdragon-profiler/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
desktopItems = [(makeDesktopItem {
name = pname;
desktopName = "Snapdragon Profiler";
- exec = "$out/bin/snapdragon-profiler";
+ exec = "snapdragon-profiler";
icon = "snapdragon-profiler";
comment = meta.description;
categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ];
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 44a44b3af2..049e369e29 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ibus-mozc";
- version = "2.26.4423.100";
+ version = "2.26.4660.102";
src = fetchFromGitHub {
owner = "google";
repo = "mozc";
- rev = "7654223979067e3c5ae52ea238d43880c5508f85";
- sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0=";
+ rev = "063c41f1d7c1a877f44c1f8caad6be1897350336";
+ sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix
index 82664c3700..1ac061034d 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix
@@ -18,12 +18,17 @@
, buildPythonApplication
, procps
, gtksourceview4
+, nixosTests
# Change the default log level to debug for easier debugging of package issues
, withDebugLogLevel ? false
# Xmodmap is an optional dependency
# If you use Xmodmap to set keyboard mappings (or your DE does)
# it is required to correctly map keys
, withXmodmap ? true
+ # Some tests are flakey under high CPU load and could cause intermittent
+ # failures when building. Override this to true to run tests anyway
+ # See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306
+, withDoCheck ? false
# Version and rev and hash are package arguments to allow overriding
# while ensuring the values in prePatch and src match
# https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7
@@ -65,7 +70,7 @@ buildPythonApplication {
substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)"
'');
- doCheck = true;
+ doCheck = withDoCheck;
checkInputs = [
psutil
];
@@ -146,6 +151,8 @@ buildPythonApplication {
install -m755 -D -t $out/bin/ bin/input-remapper*
'';
+ passthru.tests = nixosTests.input-remapper;
+
meta = with lib; {
description = "An easy to use tool to change the mapping of your input device buttons";
homepage = "https://github.com/sezanzeb/input-remapper";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix
index a6c2ca77c5..3ee53c0f59 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
- version = "2.29.6";
+ version = "2.30.0";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is=";
+ sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE=";
};
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix
index 907420b82d..ad4158c10d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix
@@ -6,12 +6,12 @@
mkDerivation rec {
pname = "calamares";
- version = "3.2.51";
+ version = "3.2.53";
# release including submodule
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-MOs+VoqzHYRSXbOO8voj+3jvtYQnWyYAcTelS594LXA=";
+ sha256 = "sha256-LWkgQsvP7XmupBDSAnbwewWRT+ZaALyDFw3w7iz66X0=";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index 99461f6b1f..787e4248d4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.12.1";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-0v7BD/8Hpl6SLsfWWFC+XCH7Pe2RcziMM6nRTPsOBec=";
+ sha256 = "sha256-Ui9zj/PI8vYkbT8M13dZ1N4sxhM8fo8ZVeOP9Oa35xg=";
};
- vendorSha256 = "sha256-QWOVcdFlUFS1kjLmwo2zY3s/sVSRxkeOVBWPyUYjbss=";
+ vendorSha256 = "sha256-6+T0UQDrCnoRZkMajyw50eH/AFIUzCgxCkWVmTfycD0=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix
index 4e278b8cc6..e8bbb9540a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/clipster/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "clipster";
- version = "2.0.2";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "mrichar1";
repo = "clipster";
rev = version;
- sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p";
+ sha256 = "sha256-MLLkFsBBQtb7RFQN+uoEmuCn5bnbkYsqoyWGZtTCI2U=";
};
pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
index f74f7855d0..7f1655b984 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix
@@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "205";
+ version = "207";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ=";
+ sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg=";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix
index 6105b07c34..95d9f91127 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/gaphor/default.nix
@@ -1,44 +1,55 @@
{ lib
, buildPythonApplication
, fetchPypi
-, poetry-core
-, gobject-introspection
-, pango
-, gtksourceview4
-, wrapGAppsHook
-, makeDesktopItem
, copyDesktopItems
+, gobject-introspection
+, poetry-core
+, wrapGAppsHook
+, gtksourceview4
+, pango
, gaphas
, generic
+, jedi
, pycairo
, pygobject3
-, python
, tinycss2
+, gtk3
+, librsvg
+, makeDesktopItem
+, python
}:
buildPythonApplication rec {
pname = "gaphor";
- version = "2.6.5";
+ version = "2.8.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IFsbWx5lblKsnEibVihM6ZPRoydXC+JM1gdZEUUTKxw=";
+ sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0=";
};
nativeBuildInputs = [
- poetry-core copyDesktopItems gobject-introspection wrapGAppsHook
+ copyDesktopItems
+ gobject-introspection
+ poetry-core
+ wrapGAppsHook
];
# Setting gobject-introspection on booth nativeBuildInputs and
# buildInputs because of #56943. This recognizes pango, avoiding
# a "ValueError: Namespace PangoCairo not available".
- buildInputs = [ gobject-introspection gtksourceview4 pango ];
+ buildInputs = [
+ gobject-introspection
+ gtksourceview4
+ pango
+ ];
propagatedBuildInputs = [
gaphas
generic
+ jedi
pycairo
pygobject3
tinycss2
@@ -52,10 +63,20 @@ buildPythonApplication rec {
desktopName = "Gaphor";
};
+ # We need to wrap it manually to resolve all icons
+ dontWrapGApps = true;
+
postInstall = ''
install -Dm644 $out/${python.sitePackages}/gaphor/ui/icons/hicolor/scalable/apps/org.gaphor.Gaphor.svg $out/share/pixmaps/gaphor.svg
'';
+ preFixup = ''
+ wrapProgram $out/bin/gaphor \
+ ''${gappsWrapperArgs[@]} \
+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+ --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ '';
+
meta = with lib; {
description = "Simple modeling tool written in Python";
maintainers = with maintainers; [ wolfangaukang ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
index 6ba6120704..ec3f480ebf 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.5.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-H7LgADzES5Zi5+lcooix+WCjDxqkThIIGvwa8IiHDHo=";
+ sha256 = "sha256-MnsIm8E6CR5tEB6Oq35fJKQiPJfqP86/hp0t6lqJ0JE=";
};
- vendorSha256 = "sha256-4Hb+SmmPk4+c4QoOJADinKGD1xd0RYzn2wniuBxatAw=";
+ vendorSha256 = "sha256-Kwa2hzsuw3BNLubcqd7Vmpg49P78Yjt3LboLotoGWYM=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
index 684d62b464..1a5cc30264 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix
@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec {
pname = "hyperfine";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-Vs754nvtYV5d736xsZ2foawfxMc25bUfMhm8Vxqxw6U=";
+ sha256 = "sha256-1TWaLw1JxUE8RjPVVTldCbMSArNb+uhXM865iuJaJUo=";
};
- cargoSha256 = "sha256-X9WFnKP2+GM8V1kyd5VxpwBXql8Be5mugBVGrYdSsaM=";
+ cargoSha256 = "sha256-kzDjxWMXie6qjherzdXvHxrS4i8FAXcKiuk/+wbMkAA=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix
index cd30674b31..0a6888bb34 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kepubify";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "pgaskin";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-pe4jNBoPjrkvsdeFjH4TNwacp0qkf+v+SjIAZqV1GWE=";
+ sha256 = "sha256-H6W+C5twXit7Z9hLIJKAftbnvYDA9HAb9tR6yeQGRKI=";
};
- vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y=";
+ vendorSha256 = "sha256-QOMLwDDvrDQAaK4M4QhBFTGD1CzblkDoA3ZqtCoRHtQ=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix
index 321b139ca1..c62bcbe0bc 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix
@@ -15,13 +15,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "nautilus-open-any-terminal";
- version = "0.2.15";
+ version = "0.2.16";
src = fetchFromGitHub {
owner = "Stunkymonkey";
repo = pname;
rev = version;
- sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY=";
+ sha256 = "sha256-g5B+tp131vmjShBCGrKR5ZQCjtJY823/kPacZ0S9E80=";
};
patches = [ ./hardcode-gsettings.patch ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
index 0e27139b5b..3fda2a6cda 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "nncp";
- version = "8.6.0";
+ version = "8.7.1";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
- sha256 = "sha256-rhbwoJwbfR2jdn4cD0ENnCmsyuYypEipVdtKDxW/g48=";
+ hash = "sha256-zrTRl69ajZ6Tt0nVwPULU+Z0ajGK9Hs2S/XLMj1sTr0=";
};
nativeBuildInputs = [ go redo-apenwarr ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix
index 4bfc390335..57a21a2822 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
- version = "0.45.1";
+ version = "0.46.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
- sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0=";
+ sha256 = "sha256-VD/gN9lUwzhRTfr8rAQld+4sN+deYhUlNvCphtZncDU=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
- vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0=";
+ vendorSha256 = "sha256-ojNDDPCo6TGp8BYio/pYykXSLjC5Qplw0WFD9UIiYM4=";
subPackages = [ "cmd/otelcontribcol" ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix
index 72aea5c44d..851d4f2dc1 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix
@@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
- version = "0.45.0";
+ version = "0.46.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
- sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs=";
+ sha256 = "sha256-ibaA9oCSsId9A4ul5sfM+L8ExBl+Wv7rhGnb6TZ4WJw=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
- vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs=";
+ vendorSha256 = "sha256-Okmsd/skfBmkyLv9oPFH0QvewFZFPpUH2ahWxHt7cy8=";
preBuild = ''
# set the build version, can't be done via ldflags
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pandoc-acro/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pandoc-acro/default.nix
new file mode 100644
index 0000000000..1a2aff12ec
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/pandoc-acro/default.nix
@@ -0,0 +1,69 @@
+{ buildPythonApplication
+, fetchPypi
+, pandocfilters
+, panflute
+, lib
+, pandoc
+, pandoc-acro
+, texlive
+, runCommand
+}:
+
+let
+ pname = "pandoc-acro";
+ version = "0.10.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0=";
+ };
+in
+buildPythonApplication {
+ inherit pname version src;
+
+ propagatedBuildInputs = [
+ pandocfilters
+ panflute
+ ];
+
+ # Something in the tests does not typecheck, but the tool works well.
+ doCheck = false;
+
+ passthru.tests.example-doc =
+ let
+ env = {
+ nativeBuildInputs = [
+ pandoc
+ pandoc-acro
+ (texlive.combine {
+ inherit (texlive)
+ scheme-tetex
+ acro
+ translations
+ ;
+ })
+ ];
+ };
+ in
+ runCommand "pandoc-acro-example-docs" env ''
+ set -euo pipefail
+ exampleFile="${pname}-${version}/tests/example.md"
+ metadataFile="${pname}-${version}/tests/metadata.yaml"
+ tar --extract "--file=${src}" "$exampleFile" "$metadataFile"
+ mkdir $out
+
+ pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \
+ -T pdf -o $out/example.pdf
+ pandoc -F pandoc-acro "$exampleFile" "--metadata-file=$metadataFile" \
+ -T txt -o $out/example.txt
+
+ ! grep -q "\+afaik" $out/example.txt
+ '';
+
+ meta = with lib; {
+ homepage = "https://pypi.org/project/pandoc-acro/";
+ description = "Pandoc filter which manages acronyms in Pandoc flavored Markdown sources";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ tfc ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
index 42b673e5b1..8c4fa097ea 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2022.1";
+ version = "1.2022.2";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "sha256-oEOhf7nLVGJqoK/pyTWzF+s3OYsGcEy5pIj8obSrkRY=";
+ sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pridecat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pridecat/default.nix
new file mode 100644
index 0000000000..d7bf2b86d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/pridecat/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ pname = "pridecat";
+ version = "unstable-2020-06-19";
+
+ src = fetchFromGitHub {
+ owner = "lunasorcery";
+ repo = "pridecat";
+ rev = "92396b11459e7a4b5e8ff511e99d18d7a1589c96";
+ sha256 = "sha256-PyGLbbsh9lFXhzB1Xn8VQ9zilivycGFEIc7i8KXOxj8=";
+ };
+
+ # fixes the install path in the Makefile
+ patches = [ ./fix_install.patch ];
+
+ meta = with lib; {
+ description = "Like cat, but more colorful";
+ homepage = "https://github.com/lunasorcery/pridecat";
+ license = licenses.cc-by-nc-sa-40;
+ maintainers = with maintainers; [ lunarequest ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pridecat/fix_install.patch b/third_party/nixpkgs/pkgs/tools/misc/pridecat/fix_install.patch
new file mode 100644
index 0000000000..3d05721cca
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/pridecat/fix_install.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile b/Makefile
+index 815c27e..1556807 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ CXX ?= clang
++out ?= /usr/local
+
+ all: pridecat
+
+@@ -6,7 +7,8 @@ pridecat: main.cpp
+ $(CXX) main.cpp -o pridecat -std=c++11 -lstdc++ -Wall -Wextra -O3
+
+ install: pridecat
+- cp pridecat /usr/local/bin/pridecat
++ mkdir -p ${out}/bin
++ cp pridecat ${out}/bin/pridecat
+
+ uninstall:
+ rm -f /usr/local/bin/pridecat
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix
index 667ce3cabe..c99f2a4608 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "rauc";
- version = "1.5.1";
+ version = "1.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw=";
+ sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc=";
};
passthru = {
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Safe and secure software updates for embedded Linux";
homepage = "https://rauc.io";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Only;
maintainers = with maintainers; [ emantor ];
platforms = with platforms; linux;
};
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
new file mode 100644
index 0000000000..c0e85340c8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitea }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "sanctity";
+ version = "1.2.1";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "papojari";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-rK4em0maJQS50zPfnuFSxRoXUuFCaw9ZOfmgf70Sdac=";
+ };
+
+ cargoSha256 = "sha256-IQp/sSVgKY1j6N+UcifEi74dg/PkZJoeqLekeLc/vMU=";
+
+ meta = with lib; {
+ description = "Test the 16 terminal colors in all combinations";
+ homepage = "https://codeberg.org/papojari/sanctity";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ papojari ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix
index b49cfa44c1..36983368d6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
stdenv.mkDerivation rec {
pname = "tio";
- version = "1.32";
+ version = "1.35";
src = fetchFromGitHub {
owner = "tio";
repo = "tio";
rev = "v${version}";
- hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM=";
+ hash = "sha256-JXY6C2gYG7UmTrYIvHjn/8mL70uvXTsXbNoFr09qhcw=";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ meson ninja ];
meta = with lib; {
description = "Serial console TTY";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix
index e936ca584b..de746f39b4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "wakatime";
- version = "1.37.0";
+ version = "1.38.0";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
rev = "v${version}";
- sha256 = "sha256-1JOsE8u4+LlWL9nU/fXIqVME1VsgxZV84lJXNTY2pZg=";
+ sha256 = "sha256-nlv0NOvUi/yf2lQytdfRE7YwcSpRHQRlI0zzeKAA760=";
};
vendorSha256 = "sha256-WKay4/bsy8jCOTQ2jHQPMBNfIuTI3QzdmhG1aOHNK0Y=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
index b73b41acd8..89ca84395d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, brotli
, ffmpeg
, rtmpdump
, phantomjs2
@@ -11,7 +12,6 @@
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
-, hlsEncryptedSupport ? true
, withAlias ? false # Provides bin/youtube-dl for backcompat
}:
@@ -20,16 +20,15 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2022.2.4";
+ version = "2022.3.8.2";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
- sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU=";
+ sha256 = "sha256-aFRleMGObOh0ULU3adXVt/WiPlIJeEl222x8y/eVSyE=";
};
- propagatedBuildInputs = [ websockets mutagen ]
- ++ lib.optional hlsEncryptedSupport pycryptodomex;
+ propagatedBuildInputs = [ brotli mutagen pycryptodomex websockets ];
# Ensure these utilities are available in $PATH:
# - ffmpeg: post-processing & transcoding support
@@ -52,7 +51,7 @@ buildPythonPackage rec {
doCheck = false;
postInstall = lib.optionalString withAlias ''
- ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
+ ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
'';
meta = with lib; {
@@ -68,6 +67,6 @@ buildPythonPackage rec {
you can modify it, redistribute it or use it however you like.
'';
license = licenses.unlicense;
- maintainers = with maintainers; [ mkg20001 ];
+ maintainers = with maintainers; [ mkg20001 SuperSandro2000 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix
index 54ea08ceae..10765befd4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/arping/default.nix
@@ -1,25 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libnet
+, libpcap
+}:
stdenv.mkDerivation rec {
- version = "2.22";
pname = "arping";
-
- buildInputs = [ libnet libpcap ];
+ version = "2.23";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-yFSLhhyz6i7xyJR8Ax8FnHFGNe/HE40YirkkeefBqC4=";
+ hash = "sha256-Yn0EFb23VJvcVluQhwGHg9cdnZ8LKlBEds7cq8Irftc=";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
+
+ buildInputs = [
+ libnet
+ libpcap
+ ];
meta = with lib; {
description = "Broadcasts a who-has ARP packet on the network and prints answers";
homepage = "https://github.com/ThomasHabets/arping";
- license = with licenses; [ gpl2 ];
- maintainers = [ maintainers.michalrus ];
+ license = with licenses; [ gpl2Plus ];
+ maintainers = with maintainers; [ michalrus ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix
index ff65420a98..f18dad8c0c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "brook";
- version = "20220401";
+ version = "20220404";
src = fetchFromGitHub {
owner = "txthinking";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-H6lH4LG7MhxQsGVs3CSVX9FEywONDrS5bsjzw5b5k/U=";
+ sha256 = "sha256-yQuGaj5HukO+OENCpVMkoXv2AztygjrDPXgHaVBFyZ8=";
};
- vendorSha256 = "sha256-3ndpmERtaLHuTMMUcq+OenBxgW3+qy/bZCiWRgI0L84=";
+ vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";
meta = with lib; {
homepage = "https://github.com/txthinking/brook";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
index b746bf557c..ba17f10e96 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,13 +1,17 @@
-{ lib, stdenv, fetchurl, pkg-config, dbus, nettle, fetchpatch
-, libidn, libnetfilter_conntrack, buildPackages }:
+{ lib, stdenv, fetchurl, pkg-config, nettle, fetchpatch
+, libidn, libnetfilter_conntrack, buildPackages
+, dbusSupport ? stdenv.isLinux
+, dbus
+}:
with lib;
let
copts = concatStringsSep " " ([
"-DHAVE_IDN"
"-DHAVE_DNSSEC"
- ] ++ optionals stdenv.isLinux [
+ ] ++ optionals dbusSupport [
"-DHAVE_DBUS"
+ ] ++ optionals stdenv.isLinux [
"-DHAVE_CONNTRACK"
]);
in
@@ -52,11 +56,12 @@ stdenv.mkDerivation rec {
substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
--replace "/usr/local/sbin" "$out/bin"
'' + optionalString stdenv.isLinux ''
- install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time
install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release
install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6
+ '' + optionalString dbusSupport ''
+ install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf
mkdir -p $out/share/dbus-1/system-services
cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
[D-BUS Service]
@@ -69,7 +74,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ nettle libidn ]
- ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ];
+ ++ optionals dbusSupport [ dbus ]
+ ++ optionals stdenv.isLinux [ libnetfilter_conntrack ];
meta = {
description = "An integrated DNS, DHCP and TFTP server for small networks";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/goflow/default.nix b/third_party/nixpkgs/pkgs/tools/networking/goflow/default.nix
new file mode 100644
index 0000000000..bc0f0bf923
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/goflow/default.nix
@@ -0,0 +1,26 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+ pname = "goflow";
+ version = "3.4.3";
+
+ src = fetchFromGitHub {
+ owner = "cloudflare";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-dUoiuoM87Bh3ndzHG/YnwnRWnVbtPDuVdICEXcezCp8=";
+ };
+
+ vendorSha256 = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg=";
+
+ meta = with lib; {
+ description = "A NetFlow/IPFIX/sFlow collector in Go";
+ homepage = "https://github.com/cloudflare/goflow";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ heph2 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix
index afc57cb723..47b7a601d4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec {
pname = "haproxy";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
- sha256 = "sha256-1vo8ZvcH/5O1vSfOaecKiWTXtweFSLUYaNR9ffOUP+Q=";
+ sha256 = "sha256-3EAV2Fx/74EbRZgDt2MAHYCbB6klHcGGT+25oHtErvs=";
};
buildInputs = [ openssl zlib ]
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# TODO: make it work on bsd as well
makeFlags = [
- "PREFIX=\${out}"
+ "PREFIX=${placeholder "out"}"
("TARGET=" + (if stdenv.isSunOS then "solaris"
else if stdenv.isLinux then "linux-glibc"
else if stdenv.isDarwin then "osx"
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
hardware.
'';
homepage = "https://haproxy.org";
- license = licenses.gpl2;
+ changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG";
+ license = with licenses; [ gpl2Plus lgpl21Only ];
maintainers = with maintainers; [ fuzzy-id ];
platforms = with platforms; linux ++ darwin;
};
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix
deleted file mode 100644
index 757c886fdf..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib
-, udev, libnl, libuuid, gnutls, dhcp
-, libgcrypt, perl, libgudev, avahi, ppp, kmod }:
-
-stdenv.mkDerivation rec {
- pname = "networkmanager";
- version = "0.9.8.10";
-
- src = fetchurl {
- url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
- sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
- };
-
- preConfigure = ''
- substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
- substituteInPlace src/nm-device.c \
- --replace @avahi@ ${avahi} \
- --replace @kmod@ ${kmod}
- substituteInPlace src/ppp-manager/nm-ppp-manager.c \
- --replace @ppp@ ${ppp} \
- --replace @kmod@ ${kmod}
- '';
-
- # Right now we hardcode quite a few paths at build time. Probably we should
- # patch networkmanager to allow passing these path in config file. This will
- # remove unneeded build-time dependencies.
- configureFlags = [
- "--with-distro=exherbo"
- "--with-dhclient=${dhcp}/sbin/dhclient"
- "--with-dhcpcd=no"
- "--with-iptables=no"
- "--with-udev-dir=\${out}/lib/udev"
- "--with-resolvconf=no"
- "--sysconfdir=/etc" "--localstatedir=/var"
- "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
- "--with-crypto=gnutls" "--disable-more-warnings"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--with-kernel-firmware-dir=/run/current-system/firmware"
- "--disable-ppp"
- ];
-
- buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ];
-
- propagatedBuildInputs = [ dbus-glib ];
-
- nativeBuildInputs = [ intltool pkg-config ];
-
- patches =
- [ ./libnl-3.2.25.patch
- ./nixos-purity.patch
- ];
-
- preInstall =
- ''
- installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
- '';
-
- meta = with lib; {
- homepage = "http://projects.gnome.org/NetworkManager/";
- description = "Network configuration and management tool";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch
deleted file mode 100644
index 17c2966b70..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
-index ba8053e..5ac39d3 100644
---- a/src/nm-netlink-monitor.c
-+++ b/src/nm-netlink-monitor.c
-@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg)
- static int
- event_msg_recv (struct nl_msg *msg, void *arg)
- {
-- struct nl_sock *nlh = arg;
-- struct nlmsghdr *hdr = nlmsg_hdr (msg);
- struct ucred *creds = nlmsg_get_creds (msg);
-- const struct sockaddr_nl *snl;
-- guint32 local_port;
-- gboolean accept_msg = FALSE;
--
-- /* Only messages sent from the kernel */
-- if (!creds || creds->uid != 0) {
-- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d",
-- creds ? creds->uid : -1);
-- return NL_SKIP;
-- }
--
-- snl = nlmsg_get_src (msg);
-- g_assert (snl);
--
-- /* Accept any messages from the kernel */
-- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0)
-- accept_msg = TRUE;
-
-- /* And any multicast message directed to our netlink PID, since multicast
-- * currently requires CAP_ADMIN to use.
-- */
-- local_port = nl_socket_get_local_port (nlh);
-- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups)
-- accept_msg = TRUE;
--
-- if (accept_msg == FALSE) {
-- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)",
-- hdr->nlmsg_pid,
-- local_port,
-- (hdr->nlmsg_flags & NLM_F_MULTI));
-- return NL_SKIP;
-+ if (!creds || creds->pid || creds->uid || creds->gid) {
-+ if (creds)
-+ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)",
-+ creds->pid, creds->uid, creds->gid);
-+ else
-+ nm_log_dbg (LOGD_HW, "netlink: received message without credentials");
-+ return NL_STOP;
- }
-
- return NL_OK;
-@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh,
- {
- int err;
-
-- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data);
-+ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL);
-
- if (valid_func)
- nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data);
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch
deleted file mode 100644
index 9ebc080ba9..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
-index 0932139..5b5aee8 100644
---- a/src/dhcp-manager/nm-dhcp-dhclient.c
-+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -68,10 +68,6 @@ const char *
- nm_dhcp_dhclient_get_path (const char *try_first)
- {
- static const char *dhclient_paths[] = {
-- "/sbin/dhclient",
-- "/usr/sbin/dhclient",
-- "/usr/pkg/sbin/dhclient",
-- "/usr/local/sbin/dhclient",
- NULL
- };
- const char **path = dhclient_paths;
-diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-index 237661f..48bc33f 100644
---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
-+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-@@ -51,10 +51,6 @@ const char *
- nm_dhcp_dhcpcd_get_path (const char *try_first)
- {
- static const char *dhcpcd_paths[] = {
-- "/sbin/dhcpcd",
-- "/usr/sbin/dhcpcd",
-- "/usr/pkg/sbin/dhcpcd",
-- "/usr/local/sbin/dhcpcd",
- NULL
- };
- const char **path = dhcpcd_paths;
-diff --git a/src/nm-device.c b/src/nm-device.c
-index 1dc94ee..e60f3c8 100644
---- a/src/nm-device.c
-+++ b/src/nm-device.c
-@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason)
- char *argv[6], *cmdline;
- const char **aipd_binary = NULL;
- static const char *aipd_paths[] = {
-- "/usr/sbin/avahi-autoipd",
-- "/usr/local/sbin/avahi-autoipd",
-+ "@avahi@/sbin/avahi-autoipd",
- NULL
- };
- int i = 0;
-@@ -2555,7 +2554,7 @@ share_init (void)
- }
-
- for (iter = modules; *iter; iter++) {
-- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
-+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL };
- char *envp[1] = { NULL };
- GError *error = NULL;
-
-diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
-index 59698c3..7dba0f7 100644
---- a/src/ppp-manager/nm-ppp-manager.c
-+++ b/src/ppp-manager/nm-ppp-manager.c
-@@ -661,9 +661,7 @@ static inline const char *
- nm_find_pppd (void)
- {
- static const char *pppd_binary_paths[] = {
-- "/usr/local/sbin/pppd",
-- "/usr/sbin/pppd",
-- "/sbin/pppd",
-+ "@ppp@/sbin/pppd",
- NULL
- };
-
-@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
-
- /* Make sure /dev/ppp exists (bgo #533064) */
- if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
-- ignored = system ("/sbin/modprobe ppp_generic");
-+ ignored = system ("@kmod@/bin/modprobe ppp_generic");
-
- connection = nm_act_request_get_connection (req);
- g_assert (connection);
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix
index 67cd874d6f..f3ea9f677c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix
@@ -54,11 +54,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
- version = "1.34.0";
+ version = "1.36.2";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
- sha256 = "sha256-gZeV0ImQdiBPVnJCGljxsdnjk1Nu6Hu4RLkR5iQ78L0=";
+ sha256 = "1aqc8z8zv1sds439ilihwqczwg9iqzki0f007fd2x0s17fz5r1db";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch
index 8c7c4b2fa4..75d2b7c754 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch
+++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch
@@ -1,8 +1,8 @@
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
-index e398cb9f2f..a43d61864f 100644
+index 148acade5c..6395fbfbe5 100644
--- a/data/84-nm-drivers.rules
+++ b/data/84-nm-drivers.rules
-@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
+@@ -7,6 +7,6 @@ ACTION!="add|change|move", GOTO="nm_drivers_end"
# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
DRIVERS=="?*", GOTO="nm_drivers_end"
@@ -24,19 +24,19 @@ index e23b3a5282..c7246a3b61 100644
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
-index 21863b9533..c9b709659d 100644
+index a11486d54b..de8e9022c6 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
-@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self)
- gw = nm_ip4_config_best_default_route_get(priv->ip_config_4);
+@@ -13571,14 +13571,14 @@ nm_device_start_ip_check(NMDevice *self)
+ gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
if (gw) {
_nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
+ ping_binary = "@iputils@/bin/ping";
log_domain = LOGD_IP4;
}
- } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
- gw = nm_ip6_config_best_default_route_get(priv->ip_config_6);
+ } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
+ gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
if (gw) {
_nm_utils_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
@@ -65,10 +65,10 @@ index 21a01e0b04..091c98428f 100644
'--lib-path', meson.current_build_dir(),
'--gir', '@INPUT@',
diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
-index 6435dcc482..214d01194e 100644
+index 9ad030df76..8d800fb1c0 100644
--- a/src/libnm-platform/nm-platform-utils.c
+++ b/src/libnm-platform/nm-platform-utils.c
-@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
+@@ -2207,7 +2207,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
/* construct the argument list */
argv = g_ptr_array_sized_new(4);
@@ -78,13 +78,13 @@ index 6435dcc482..214d01194e 100644
g_ptr_array_add(argv, (char *) arg1);
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
-index 72691e34c2..95495b6585 100644
+index e2c0c394bd..1a507aa0d4 100644
--- a/src/libnmc-base/nm-vpn-helpers.c
+++ b/src/libnmc-base/nm-vpn-helpers.c
@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
gs_free const char **output_v = NULL;
- const char *const * iter;
- const char * path;
+ const char *const *iter;
+ const char *path;
- const char *const DEFAULT_PATHS[] = {
- "/sbin/",
- "/usr/sbin/",
diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix
index f417bb496f..84854a4bdf 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "qrcp";
- version = "0.8.4";
+ version = "0.8.5";
src = fetchFromGitHub {
owner = "claudiodangelis";
repo = "qrcp";
rev = version;
- sha256 = "1m1xbb3x526j2v8m5m46km9zzj3dk9fvm5wckyqb8kxm4md12y50";
+ sha256 = "sha256-UpSYJ/OXFObqhmGlIm73104tVfEVOjGt1r9GKLgrLtI=";
};
vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
index 31ff649e5f..7d06c4ac51 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -17,6 +17,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
+ cargoBuildFlags = [
+ "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun"
+ ];
+
# all of these rely on connecting to www.example.com:80
checkFlags = [
"--skip=http_proxy"
diff --git a/third_party/nixpkgs/pkgs/tools/networking/snet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snet/default.nix
new file mode 100644
index 0000000000..f458521468
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/snet/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "snet";
+ version = "unstable-2021-11-26";
+
+ src = fetchFromGitHub {
+ owner = "monsterxx03";
+ repo = "snet";
+ rev = "89089b55277ce3e21e2ed79a9d307f2ecc62c6db";
+ sha256 = "sha256-lTbygQRABv+Dp4i7nDgXYqi4pwU2rtLNfpgtBgsq+7Y=";
+ };
+
+ vendorSha256 = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4=";
+
+ meta = with lib; {
+ description = "Transparent proxy works on linux desktop, MacOS, router";
+ homepage = "https://github.com/monsterxx03/snet";
+ license = licenses.mit;
+ maintainers = with maintainers; [ azuwis ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix
index 48ffb550c2..fdedff083b 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/sniffglue/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffglue";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-s+2YzfSy7+o0VZZ4j/Cfd6F5GvBytthmDJqrPw+7SU0=";
+ sha256 = "sha256-8SkwdPaKHf0ZE/MeM4yOe2CpQvZzIHf5d06iM7KPAT8=";
};
- cargoSha256 = "sha256-4G1OGY7/vE8NKBFeuOZzqyZ0DQN4hy/HBO9qrEtBYlM=";
+ cargoSha256 = "sha256-UGvFLW48sakNuV3eXBpCxaHOrveQPXkynOayMK6qs4g=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix
index d38200a53d..9f0dfe7c38 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "subfinder";
- version = "2.4.9";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4=";
+ sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y=";
};
- vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0=";
+ vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M=";
modRoot = "./v2";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix
index 17e8d9b9fb..31ff5235aa 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
- version = "0.35.1";
+ version = "0.35.2";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eEvSELCzpAm9Me46U54MQEQiAPCFlBa5iG2AZMn5BbE=";
+ sha256 = "sha256-QCCDZ0zsAqV7tvlBeyTpN5iz/jBc50oBgrmUB/R5wCY=";
};
- vendorSha256 = "sha256-aYY3rGm2Wvd5v1QrfhN0jWzAO9JYu4j5ZHk9UyEPjH8=";
+ vendorSha256 = "sha256-h4sNfV8B+WGgfVPDmWVNek7fQo5qZ3+VGkx4VSw4QF8=";
subPackages = [ "cmd/tendermint" ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix
index bc0c19f331..ddd2d460f7 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tinyssh";
- version = "20220222";
+ version = "20220305";
src = fetchFromGitHub {
owner = "janmojzis";
repo = "tinyssh";
rev = version;
- sha256 = "sha256-wSi8D82TOXZdUcfrvZJNd6oePvKWQepRW1r7A2fWApA=";
+ sha256 = "sha256-d49saN0I22DZixx5AdvQmx3WM7yzQH5lOKnKbzhlls0=";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix
index e42a92e622..ac84150255 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
- version = "0.7.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
- sha256 = "sha256-jhmNDzNICcXc0p+Esi+uWCL1wOkGDyrJGBa0IEnkE08=";
+ sha256 = "sha256-fJ/WHSU45bMJRDqz9yA3B2lwXtW5DKooU+Pzn13GyZI=";
};
- cargoSha256 = "sha256-4EtiF2W0J0OeguLDfjJbpHQKUZNtejxbTF1gNiP7SEQ=";
+ cargoSha256 = "sha256-mIcTgpWI5iuMH03EsZalmAxjpme+bsIJU7kW9PavHEM=";
passthru.tests = {
version = testVersion { package = alejandra; };
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "The Uncompromising Nix Code Formatter";
homepage = "https://github.com/kamadorueda/alejandra";
+ changelog = "https://github.com/kamadorueda/alejandra/blob/${version}/CHANGELOG.md";
license = licenses.unlicense;
maintainers = with maintainers; [ _0x4A6F kamadorueda ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
index a0700e43c5..caa9abb9a1 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix
@@ -1,41 +1,158 @@
-{ mkDerivation, ansi-terminal, async, attoparsec, base, containers
-, cassava, directory, HUnit, mtl, nix-derivation, process, relude, lib
-, stm, terminal-size, text, time, unix, wcwidth, fetchFromGitHub
-, lock-file, data-default, expect, runtimeShell
+# This file has been autogenerate with cabal2nix.
+# Update via ./update.sh"
+{
+ mkDerivation,
+ ansi-terminal,
+ async,
+ attoparsec,
+ base,
+ cassava,
+ containers,
+ data-default,
+ directory,
+ expect,
+ extra,
+ fetchzip,
+ filepath,
+ generic-optics,
+ HUnit,
+ installShellFiles,
+ lib,
+ lock-file,
+ MemoTrie,
+ mtl,
+ nix-derivation,
+ optics,
+ process,
+ random,
+ relude,
+ runtimeShell,
+ safe,
+ stm,
+ streamly,
+ terminal-size,
+ text,
+ time,
+ unix,
+ vector,
+ wcwidth,
}:
-mkDerivation rec {
+mkDerivation {
pname = "nix-output-monitor";
- version = "1.0.4.0";
- src = fetchFromGitHub {
- owner = "maralorn";
- repo = "nix-output-monitor";
- hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0=";
- rev = "v${version}";
+ version = "1.1.1.0";
+ src = fetchzip {
+ url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.1.0.tar.gz";
+ sha256 = "1zw7x1snyycl1bp5w7jh8wwnynqvw3g4glr293bnzi5jyirj5wlg";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal async attoparsec base cassava containers directory mtl
- nix-derivation relude stm terminal-size text time unix wcwidth lock-file
+ ansi-terminal
+ async
+ attoparsec
+ base
+ cassava
+ containers
data-default
+ directory
+ extra
+ filepath
+ generic-optics
+ lock-file
+ MemoTrie
+ mtl
+ nix-derivation
+ optics
+ random
+ relude
+ safe
+ stm
+ streamly
+ terminal-size
+ text
+ time
+ unix
+ vector
+ wcwidth
];
executableHaskellDepends = [
- ansi-terminal async attoparsec base containers directory mtl
- nix-derivation relude stm text time unix
+ ansi-terminal
+ async
+ attoparsec
+ base
+ cassava
+ containers
+ data-default
+ directory
+ extra
+ filepath
+ generic-optics
+ lock-file
+ MemoTrie
+ mtl
+ nix-derivation
+ optics
+ random
+ relude
+ safe
+ stm
+ streamly
+ terminal-size
+ text
+ time
+ unix
+ vector
+ wcwidth
];
testHaskellDepends = [
- ansi-terminal async attoparsec base containers directory HUnit mtl
- nix-derivation process relude stm text time unix
+ ansi-terminal
+ async
+ attoparsec
+ base
+ cassava
+ containers
+ data-default
+ directory
+ extra
+ filepath
+ generic-optics
+ HUnit
+ lock-file
+ MemoTrie
+ mtl
+ nix-derivation
+ optics
+ process
+ random
+ relude
+ safe
+ stm
+ streamly
+ terminal-size
+ text
+ time
+ unix
+ vector
+ wcwidth
];
+ homepage = "https://github.com/maralorn/nix-output-monitor";
+ description = "Parses output of nix-build to show additional information";
+ license = lib.licenses.agpl3Plus;
+ maintainers = with lib.maintainers; [maralorn];
+ passthru.updateScript = ./update.sh;
+ testTarget = "unit-tests";
+ buildTools = [installShellFiles];
postInstall = ''
cat > $out/bin/nom-build << EOF
#!${runtimeShell}
${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom
EOF
chmod a+x $out/bin/nom-build
+ installShellCompletion --zsh --name _nom-build ${
+ builtins.toFile "completion.zsh" ''
+ #compdef nom-build
+ compdef nom-build=nix-build
+ ''
+ }
'';
- homepage = "https://github.com/maralorn/nix-output-monitor";
- description = "Parses output of nix-build to show additional information";
- license = lib.licenses.agpl3Plus;
- maintainers = [ lib.maintainers.maralorn ];
}
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/update.sh b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/update.sh
new file mode 100755
index 0000000000..ad5da00003
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/update.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p cabal2nix curl jq alejandra
+#
+# This script will update the nix-output-monitor derivation to the latest version using
+# cabal2nix.
+
+set -eo pipefail
+
+# This is the directory of this update.sh script.
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+derivation_file="${script_dir}/default.nix"
+
+# This is the latest released version of nix-output-monitor on GitHub.
+new_version=$(curl --silent "https://api.github.com/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output)
+
+echo "Updating nix-output-monitor to version $new_version."
+echo "Running cabal2nix and outputting to ${derivation_file}..."
+
+cat > "$derivation_file" << EOF
+# This file has been autogenerate with cabal2nix.
+# Update via ./update.sh"
+EOF
+
+cabal2nix \
+ --extra-arguments expect \
+ --extra-arguments runtimeShell\
+ --extra-arguments installShellFiles\
+ --maintainer maralorn \
+ "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" \
+ | head -n-1 >> "$derivation_file"
+
+cat >> "$derivation_file" << EOF
+ passthru.updateScript = ./update.sh;
+ testTarget = "unit-tests";
+ buildTools = [ installShellFiles ];
+ postInstall = ''
+ cat > \$out/bin/nom-build << EOF
+ #!\${runtimeShell}
+ \${expect}/bin/unbuffer nix-build "\\\$@" 2>&1 | exec \$out/bin/nom
+ EOF
+ chmod a+x \$out/bin/nom-build
+ installShellCompletion --zsh --name _nom-build \${builtins.toFile "completion.zsh" ''
+ #compdef nom-build
+ compdef nom-build=nix-build
+ ''}
+ '';
+}
+EOF
+
+alejandra "${derivation_file}" | cat
+
+echo "Finished."
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix
index 016f07a7d3..4bdf7c4c7a 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix
@@ -21,16 +21,25 @@ let
})
];
});
+
+ spdlog' = spdlog.overrideAttrs (oldAttrs: {
+ # Required for header files. See alse:
+ # https://github.com/gabime/spdlog/pull/1241 (current solution)
+ # https://github.com/gabime/spdlog/issues/1897 (previous solution)
+ cmakeFlags = oldAttrs.cmakeFlags ++ [
+ "-DSPDLOG_FMT_EXTERNAL=OFF"
+ ];
+ });
in
stdenv.mkDerivation rec {
pname = "micromamba";
- version = "0.18.1";
+ version = "0.21.2";
src = fetchFromGitHub {
owner = "mamba-org";
repo = "mamba";
- rev = version;
- sha256 = "1gr9r257l300hafp8zm61bn58rysdk9i4wv1879q96b6n6v8hwa6";
+ rev = "mamba-" + version;
+ sha256 = "0zsl0rhsx87vvwcwc1xn7gqgbxffprr8dyc9rkr6kcr4rjgy9yzp";
};
nativeBuildInputs = [ cmake ];
@@ -43,17 +52,11 @@ stdenv.mkDerivation rec {
libyamlcpp
libsolv'
reproc
- spdlog
+ spdlog'
termcolor
ghc_filesystem
];
- postPatch = ''
- # See https://github.com/gabime/spdlog/issues/1897
- sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt
- echo 'target_link_libraries(micromamba PRIVATE -lspdlog -lfmt)' >> micromamba/CMakeLists.txt
- '';
-
cmakeFlags = [
"-DBUILD_LIBMAMBA=ON"
"-DBUILD_SHARED=ON"
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix
index 842ef5de32..2161ea3c30 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix
@@ -101,15 +101,17 @@ stdenv.mkDerivation {
lowdown
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [
libcpuid
- ] ++ lib.optional (atLeast27) [
- nlohmann_json
] ++ lib.optionals withLibseccomp [
libseccomp
] ++ lib.optionals withAWS [
aws-sdk-cpp
];
- propagatedBuildInputs = [ boehmgc ];
+ propagatedBuildInputs = [
+ boehmgc
+ ] ++ lib.optional (atLeast27) [
+ nlohmann_json
+ ];
NIX_LDFLAGS = lib.optionals (!atLeast24) [
# https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba
@@ -205,7 +207,7 @@ stdenv.mkDerivation {
};
passthru = {
- inherit boehmgc;
+ inherit aws-sdk-cpp boehmgc;
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit src version; });
};
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
index e080a57dc6..a6b7fa3a90 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -24,6 +24,9 @@ let
customMemoryManagement = false;
}).overrideDerivation (args: {
patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ];
+
+ # only a stripped down version is build which takes a lot less resources to build
+ requiredSystemFeatures = null;
});
common = args:
@@ -62,7 +65,12 @@ in lib.makeExtensible (self: {
sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=";
};
- stable = self.nix_2_6;
+ nix_2_7 = common {
+ version = "2.7.0";
+ sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=";
+ };
+
+ stable = self.nix_2_7;
unstable = lib.lowPrio (common rec {
version = "2.7";
diff --git a/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix b/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix
new file mode 100644
index 0000000000..850e632130
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "authz0";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "hahwul";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM=";
+ };
+
+ vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw=";
+
+ meta = with lib; {
+ description = "Automated authorization test tool";
+ homepage = "https://github.com/hahwul/authz0";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
index 14f7e05140..317f609271 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cdk-go";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "cdk-team";
repo = "CDK";
rev = "v${version}";
- sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml";
+ sha256 = "sha256-Ngv+/b9D27ERwjNIC3s3ZBPkV10G+tT8QW8YMOgb8aA=";
};
- vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l";
+ vendorSha256 = "sha256-9Q7f3keMUEI2cWal2dvp4b8kvTZVM1Cf4iTvH9yCyX0=";
# At least one test is outdated
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix
index 28c692b5c1..39b0187c4a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cfripper/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
- hash = "sha256-nomNjt/BV/Tu/9w4IEu3tXWQw4/wLTc64khdnQeliH0=";
+ hash = "sha256-/qcpLCk1ZZMKxhqK6q6sSbRDjiF5GQmDJzvCaV2kAqQ=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
index 5bfc16718b..63d36e9903 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
- version = "1.5.2";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-37jahAGgQn7HwwdRTlAS/oJQ3BxTkMViI6iJMBYFgjI=";
+ sha256 = "sha256-jAkTIO+tmb1vjS2eRWU9Fau7qzPCBlXJCk00iwNpULE=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,19 +16,36 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
- vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI=";
+ vendorSha256 = "sha256-E9zeRlPIIoXo/EfagHC3aDnW747SdsPiqIA384D7NQI=";
- excludedPackages = "\\(sample\\|webhook\\|help\\)";
+ subPackages = [
+ "cmd/cosign"
+ "cmd/cosign/webhook"
+ "cmd/sget"
+ ];
tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ];
- ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/pkg/version.GitVersion=v${version}" ];
+ ldflags = [
+ "-s"
+ "-w"
+ "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"
+ "-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
+ ];
- postPatch = ''
- rm pkg/cosign/tuf/client_test.go # Require network access
- rm internal/pkg/cosign/fulcio/signer_test.go # Require network access
- rm internal/pkg/cosign/rekor/signer_test.go # Require network access
+ postBuild = ''
+ # cmd/cosign/webhook should be called cosigned
+ mv $GOPATH/bin/{webhook,cosigned}
+ '';
+
+ preCheck = ''
+ # test all paths
+ unset subPackages
+
+ rm cmd/cosign/cli/fulcio/fulcioroots/fulcioroots_test.go # Require network access
rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access
+ rm pkg/cosign/tlog_test.go # Require network access
+ rm pkg/cosign/tuf/client_test.go # Require network access
'';
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
index 232e689d95..14b7d7efab 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 = "2022-03-03";
+ version = "2022-03-10";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-EH4PlUb0PGUwkgfk1oFPKimoJcWI/mozzzaTST1De7A=";
+ sha256 = "sha256-zKFkPRmA2Hl/NksJTf76RcPr1nvaLdZu2fyBp5PcZ0Y=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix
index ca0b1305d0..e881fad4a9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/kubescape/default.nix
@@ -6,20 +6,20 @@
buildGoModule rec {
pname = "kubescape";
- version = "2.0.148";
+ version = "2.0.149";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- hash = "sha256-Wn/yVGAAdAaIsHUDWWqVyAlOTYIXpbwIktX9h4LN+fQ=";
+ hash = "sha256-m6tJjC5BXxFC+bSOHbKXXGZQlJIM0+fIA+JYWBntgk8=";
};
nativeBuildInputs = [
installShellFiles
];
- vendorSha256 = "sha256-xbOUggbu/4bNT07bD3TU/7CIDvgi6OtZLQzSqQykwRY=";
+ vendorSha256 = "sha256-vplHaaT7x0ZSpvityJF5aGKDARvGPBT9DMltOpUkOMo=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index aff1c8c625..bdecd4e0a9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.31"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.32"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 64f7ec00c2..6855f10bb4 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: 2bed5461f9e43e2608a90c3331045b62e8dba26a
- ref: refs/tags/6.1.31
+ revision: f7cd9896b753377c4c663188b6c26500b7850f41
+ ref: refs/tags/6.1.32
specs:
- metasploit-framework (6.1.31)
+ metasploit-framework (6.1.32)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -31,7 +31,7 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 2.0.75)
+ metasploit-payloads (= 2.0.77)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.18)
mqtt
@@ -128,13 +128,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
- aws-partitions (1.559.0)
- aws-sdk-core (3.127.0)
+ aws-partitions (1.563.0)
+ aws-sdk-core (3.128.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.300.0)
+ aws-sdk-ec2 (1.302.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.68.0)
@@ -173,8 +173,8 @@ GEM
eventmachine (>= 1.0.0.beta.4)
erubi (1.10.0)
eventmachine (1.2.7)
- faker (2.19.0)
- i18n (>= 1.6, < 2)
+ faker (2.20.0)
+ i18n (>= 1.8.11, < 2)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
@@ -251,7 +251,7 @@ GEM
activemodel (~> 6.0)
activesupport (~> 6.0)
railties (~> 6.0)
- metasploit-payloads (2.0.75)
+ metasploit-payloads (2.0.77)
metasploit_data_models (5.0.4)
activerecord (~> 6.0)
activesupport (~> 6.0)
@@ -379,7 +379,7 @@ GEM
ruby-macho (3.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
- ruby_smb (3.0.4)
+ ruby_smb (3.0.5)
bindata
openssl-ccm
openssl-cmac
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
index e7f20acf8a..11215cd3dd 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.1.31";
+ version = "6.1.32";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw=";
+ sha256 = "sha256-UoH+tp3I9YTXXNXDaYne1E9Zpoj9fbr7mnIQws6TXJs=";
};
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 ced2ecf9bc..0104412d35 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw";
+ sha256 = "0l4f97kmsz1niicj52bm88ggbq3lvn41w0cckfwksh4yikjh20wv";
type = "gem";
};
- version = "1.559.0";
+ version = "1.563.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";
+ sha256 = "0xpqx000gq1j0n211c9bch5b2rc48a54kxk87m6y8z844c0wlqk7";
type = "gem";
};
- version = "3.127.0";
+ version = "3.128.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd";
+ sha256 = "13x9rwkykyw873prd2k9pqwrjkf9jsqih9aksbf9fn8hfnsv6db8";
type = "gem";
};
- version = "1.300.0";
+ version = "1.302.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -334,10 +334,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hb9wfxyb4ss2vl2mrj1zgdk7dh4yaxghq22gbx62yxj5yb9w4zw";
+ sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi";
type = "gem";
};
- version = "2.19.0";
+ version = "2.20.0";
};
faraday = {
groups = ["default"];
@@ -684,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a";
- sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs";
+ rev = "f7cd9896b753377c4c663188b6c26500b7850f41";
+ sha256 = "16swjg7c443jkbxvlzgxi2k5jkylvs4nkhymbkbq9xf8knvgx0aj";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.1.31";
+ version = "6.1.32";
};
metasploit-model = {
groups = ["default"];
@@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z";
+ sha256 = "0chd5rn13210fgsvm0yqd59lfgg9kpmyx82jbf33dfiw6qh6mmi1";
type = "gem";
};
- version = "2.0.75";
+ version = "2.0.77";
};
metasploit_data_models = {
groups = ["default"];
@@ -1357,10 +1357,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w7ywnf3b3dsfqarj9yc21q1f5p29vs359x5d7sipvc0ljdwn95l";
+ sha256 = "0zgw3aplb0nd8ggyy2csywvnw7gdligzdqvw18j7s5yix8g2h4cz";
type = "gem";
};
- version = "3.0.4";
+ version = "3.0.5";
};
rubyntlm = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix
index b09a37a238..ee4413c904 100644
--- a/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/minio-certgen/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio-certgen";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "minio";
repo = "certgen";
rev = "v${version}";
- sha256 = "sha256-YLFrW0w1H6u/lTP4fWPcRFTG9gIm228J2KcE4VSeG2Q=";
+ sha256 = "sha256-Qs+wpx9pRdWdY9FrBaKM8gdB0+POy80I6DB4UaBsJEE=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix b/third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix
index f6fade16b8..60dc724d5a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pgpdump/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "pgpdump";
- version = "0.34";
+ version = "0.35";
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "pgpdump";
rev = "v${version}";
- sha256 = "1vvxhbz8nqzw9gf7cdmas2shzziznsqj84w6w74h8zzgb4m3byzz";
+ sha256 = "sha256-GjPy/feF437WtDqbEn1lGwWayWtvKhqsyJFMuH3IFl4=";
};
buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
index 18db48dfb2..324af6aa4c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix
@@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec {
pname = "sequoia";
# Upstream has separate version numbering for the library and the CLI frontend.
# This derivation provides the CLI frontend, and thus uses its version number.
- version = "0.25.0";
+ version = "0.26.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "sequoia";
rev = "sq/v${version}";
- sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50";
+ sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751";
};
- cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w=";
+ cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g";
nativeBuildInputs = [
pkg-config
@@ -77,15 +77,6 @@ rustPlatform.buildRustPackage rec {
# Sometimes, tests fail on CI (ofborg) & hydra without this
CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";
- # Without this, the examples won't build
- postPatch = ''
- substituteInPlace openpgp-ffi/examples/Makefile \
- --replace '-O0 -g -Wall -Werror' '-g'
- substituteInPlace ffi/examples/Makefile \
- --replace '-O0 -g -Wall -Werror' '-g'
- '';
-
-
preInstall = lib.optionalString pythonSupport ''
export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}"
'' + lib.optionalString (!pythonSupport) ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix
index bb165c41d0..5f06abeda1 100644
--- a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
meta = with lib; {
description = "The SPIFFE Runtime Environment";
- homepage = "github.com/spiffe/spire";
+ homepage = "https://github.com/spiffe/spire";
license = licenses.asl20;
maintainers = with maintainers; [ jonringer fkautz ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
index 7baf1cf6b8..5385a9aba3 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
- version = "1.9.9";
+ version = "1.9.10";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
- sha256 = "sha256-bW7oY6O8Jsh2YQk6dOxj4Q/QMc66cUZC0hY23+JePgA=";
+ sha256 = "sha256-RKFGEJjnx7jmrFl0mcJPsuQ3SMDBOai0lE5X0TSaZPQ=";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix
index 76bfee4219..571b4e7f4d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix
@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
- version = "0.4.6.9";
+ version = "0.4.6.10";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
- sha256 = "1ad99k4wysxrnlaprv7brxr2nc0h5zdnrh0rma10pqlck2037sf7";
+ sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";
};
outputs = [ "out" "geoip" ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/update.nix b/third_party/nixpkgs/pkgs/tools/security/tor/update.nix
index c944883d41..50353ce32a 100644
--- a/third_party/nixpkgs/pkgs/tools/security/tor/update.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/tor/update.nix
@@ -15,14 +15,11 @@ with lib;
let
downloadPageUrl = "https://dist.torproject.org";
- # See https://www.torproject.org/docs/signing-keys.html
+ # See https://support.torproject.org/little-t-tor/#fetching-the-tor-developers-key
signingKeys = [
- # Roger Dingledine
- "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5"
- "F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451"
- # Nick Mathewson
- "2133 BC60 0AB1 33E1 D826 D173 FE43 009C 4607 B1FB"
- "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5"
+ "514102454D0A87DB0767A1EBBE6A0531C18A9179" # Alexander Færøy
+ "B74417EDDF22AC9F9E90F49142E86A2A11F48D36" # David Goulet
+ "2133BC600AB133E1D826D173FE43009C4607B1FB" # Nick Mathewson
];
in
@@ -52,20 +49,24 @@ srcName=''${srcBase/.tar.gz/}
srcVers=(''${srcName//-/ })
version=''${srcVers[1]}
-sigUrl=$srcUrl.asc
+checksumUrl=$srcUrl.sha256sum
+checksumFile=''${checksumUrl##*/}
+
+sigUrl=$checksumUrl.asc
sigFile=''${sigUrl##*/}
# upstream does not support byte ranges ...
[[ -e "$srcFile" ]] || curl -L -o "$srcFile" -- "$srcUrl"
+[[ -e "$checksumFile" ]] || curl -L -o "$checksumFile" -- "$checksumUrl"
[[ -e "$sigFile" ]] || curl -L -o "$sigFile" -- "$sigUrl"
export GNUPGHOME=$PWD/gnupg
mkdir -m 700 -p "$GNUPGHOME"
gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)}
-gpg --batch --verify "$sigFile" "$srcFile"
+gpg --batch --verify "$sigFile" "$checksumFile"
-sha256=$(nix-hash --type sha256 --flat --base32 "$srcFile")
+sha256sum -c "$checksumFile"
-update-source-version tor "$version" "$sha256"
+update-source-version tor "$version" "$(cut -d ' ' "$checksumFile")"
''
diff --git a/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix b/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
index 8132364298..3401fe4f31 100644
--- a/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "traitor";
- version = "0.0.9";
+ version = "0.0.14";
src = fetchFromGitHub {
owner = "liamg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SHfAPPVq5OmS0yPaSXGsMjskQdosoBN4XRLSzkrviJM=";
+ sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
index 6f1de7b45a..458e2a5338 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "vault";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "sha256-2pysQsJynuedqX9Yi4BjTnWuJZ5XTq11UEgkSh7eZyw=";
+ sha256 = "sha256-zqtRM2p+RrLrXzDCMtHJZNx/dKWyFqM+3V5eICwWvWs=";
};
- vendorSha256 = "sha256-LNN0u48B6xGjrUasxGF+4sw1HxiR22hj8H2/mSyh1SI=";
+ vendorSha256 = "sha256-EiQ6XmGrw1O2Zd8TM7HSr3sQUd1naQYKbYLKB/vWdXU=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix
index d3d982da4d..85aaee0bb9 100644
--- a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix
@@ -8,8 +8,8 @@
stdenv.mkDerivation rec {
pname = "btop";
- version = "1.2.4";
- hash = "sha256-IFuDpqRtsim2dfSTODuNK62xaLvKKcB5YBNHSQI6q44=";
+ version = "1.2.5";
+ hash = "sha256-W7DTaJVA9xqdgBjrrR+OK1buBMrjpw2T0I//ZZKQFOw=";
src = fetchFromGitHub {
owner = "aristocratos";
diff --git a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix
index 9d56e2e4c1..a7e8293851 100644
--- a/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/colordiff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }:
+{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }:
stdenv.mkDerivation rec {
pname = "colordiff";
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace Makefile \
--replace 'TMPDIR=colordiff-''${VERSION}' ""
+
+ substituteInPlace colordiff.pl \
+ --replace '= "diff";' '= "${diffutils}/bin/diff";'
'';
installFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix
index 5a05501f1e..b7fc915c44 100644
--- a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "igrep";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "konradsz";
repo = "igrep";
rev = "v${version}";
- sha256 = "sha256-ZbJogp4rTc3GAD71iQUIf5EqwJ8XD9/WmvdAcGIgcvY=";
+ sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso=";
};
- cargoSha256 = "sha256-sj2GEyUPq9+JXlGpKYRNfhfwGf5F/J46AoOjUu4xm7I=";
+ cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
@@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Interactive Grep";
homepage = "https://github.com/konradsz/igrep";
+ changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ _0x4A6F ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix
index 1362591e24..07f82c0859 100644
--- a/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/kdiff3/default.nix
@@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kdiff3";
- version = "1.9.4";
+ version = "1.9.5";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-oTBxLO7wdN9pFCaQn8SjMrZvTD8UkKVIq1v7RjFsOFo=";
+ sha256 = "sha256-CDchWW2dQ3O8LxKYOUqN21tVp61NckKTOnzYrmRoPBo=";
};
buildInputs = [ boost ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix
index 11cb4e6db0..c882e046c3 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ruplacer/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruplacer";
- version = "0.6.3";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "TankerHQ";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5r1OywctKAeSBPzjYSPith1QNxRH0hman7lnSym2XIY=";
+ sha256 = "sha256-jLGstlEqABT4ejdYlTQZaBVeYy86+lqIilyufPGIZyQ=";
};
- cargoSha256 = "sha256-JrVPEuGBVo+NCsZ1DH/Af8OLWiNXnQIBxiOukw+W5Qo=";
+ cargoSha256 = "sha256-cv+g68WQvnnd0qZDB9PfZLbsdrM+RXs27a0Q5YPiHDQ=";
buildInputs = (lib.optional stdenv.isDarwin Security);
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 31ac1d87b4..7c21458c4b 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -208,8 +208,11 @@ with pkgs;
appthreat-depscan = callPackage ../development/tools/appthreat-depscan { };
+
authy = callPackage ../applications/misc/authy { };
+ authz0 = callPackage ../tools/security/authz0 { };
+
avro-tools = callPackage ../development/tools/avro-tools { };
bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
@@ -365,9 +368,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ pridecat = callPackage ../tools/misc/pridecat { };
+
proto-contrib = callPackage ../development/tools/proto-contrib { };
- protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
+ protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };
@@ -385,6 +390,8 @@ with pkgs;
protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { };
+ protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { };
+
proton-caller = callPackage ../applications/emulators/proton-caller { };
ptags = callPackage ../development/tools/misc/ptags { };
@@ -1051,7 +1058,9 @@ with pkgs;
weidu = callPackage ../tools/games/weidu { };
- weylus = callPackage ../applications/graphics/weylus { };
+ weylus = callPackage ../applications/graphics/weylus {
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
+ };
gfshare = callPackage ../tools/security/gfshare { };
@@ -1059,6 +1068,8 @@ with pkgs;
gobgp = callPackage ../tools/networking/gobgp { };
+ goflow = callPackage ../tools/networking/goflow { };
+
gofu = callPackage ../applications/misc/gofu { };
godns = callPackage ../tools/networking/godns { };
@@ -1283,6 +1294,8 @@ with pkgs;
aldo = callPackage ../applications/radio/aldo { };
+ alglib = callPackage ../development/libraries/alglib { };
+
almanah = callPackage ../applications/misc/almanah { };
alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
@@ -3632,7 +3645,7 @@ with pkgs;
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
- oil-buku = callPackage ../applications/misc/oil { };
+ oil-buku = callPackage ../applications/misc/oil-buku { };
ossutil = callPackage ../tools/admin/ossutil {};
@@ -4419,6 +4432,8 @@ with pkgs;
brotli = callPackage ../tools/compression/brotli { };
+ biodiff = callPackage ../development/tools/biodiff { };
+
biosdevname = callPackage ../tools/networking/biosdevname { };
bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
@@ -4482,6 +4497,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
+ cobang = python3Packages.callPackage ../applications/misc/cobang {
+ gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
+ };
+
cocoapods = callPackage ../development/mobile/cocoapods { };
cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; });
@@ -5982,6 +6001,8 @@ with pkgs;
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
+ gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
+
gitstats = callPackage ../applications/version-management/gitstats { };
gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { };
@@ -6864,7 +6885,9 @@ with pkgs;
jl = haskellPackages.callPackage ../development/tools/jl { };
- jless = callPackage ../development/tools/jless { };
+ jless = callPackage ../development/tools/jless {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ };
jmespath = callPackage ../development/tools/jmespath { };
@@ -8160,9 +8183,6 @@ with pkgs;
inherit (skawarePackages) cleanPackaging;
};
- # stripped down, needed by steam
- networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { };
-
networkmanager = callPackage ../tools/networking/networkmanager { };
networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
@@ -8274,6 +8294,8 @@ with pkgs;
pa_applet = callPackage ../tools/audio/pa-applet { };
+ pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { };
+
pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };
@@ -8701,7 +8723,7 @@ with pkgs;
p7zip = callPackage ../tools/archivers/p7zip { };
- packagekit = callPackage ../tools/package-management/packagekit { };
+ packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_6; };
packetdrill = callPackage ../tools/networking/packetdrill { };
@@ -9130,6 +9152,8 @@ with pkgs;
pubs = callPackage ../tools/misc/pubs {};
+ pulumictl = callPackage ../development/tools/pulumictl { };
+
pure-prompt = callPackage ../shells/zsh/pure-prompt { };
pv = callPackage ../tools/misc/pv { };
@@ -9561,6 +9585,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ rustdesk = callPackage ../applications/networking/remote/rustdesk { };
+
rustscan = callPackage ../tools/security/rustscan {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -9635,6 +9661,8 @@ with pkgs;
samplicator = callPackage ../tools/networking/samplicator { };
+ sanctity = callPackage ../tools/misc/sanctity { };
+
sandboxfs = callPackage ../tools/filesystems/sandboxfs { };
sasquatch = callPackage ../tools/filesystems/sasquatch { };
@@ -9902,6 +9930,8 @@ with pkgs;
snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { };
+ snet = callPackage ../tools/networking/snet { };
+
sng = callPackage ../tools/graphics/sng {
libpng = libpng12;
};
@@ -9966,6 +9996,8 @@ with pkgs;
sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { };
+ soundconverter = callPackage ../applications/audio/soundconverter { };
+
soundkonverter = libsForQt5.soundkonverter;
soundwireserver = callPackage ../applications/audio/soundwireserver { };
@@ -14451,7 +14483,9 @@ with pkgs;
bazelisk = callPackage ../development/tools/bazelisk { };
- rebazel = callPackage ../development/tools/rebazel { };
+ rebazel = callPackage ../development/tools/rebazel {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
@@ -15885,6 +15919,8 @@ with pkgs;
vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
+ wails = callPackage ../development/tools/wails { };
+
whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
whatstyle = callPackage ../development/tools/misc/whatstyle {
@@ -18623,6 +18659,8 @@ with pkgs;
libschrift = callPackage ../development/libraries/libschrift { };
+ libsciter = callPackage ../development/libraries/libsciter { };
+
libsearpc = callPackage ../development/libraries/libsearpc { };
libsigcxx = callPackage ../development/libraries/libsigcxx { };
@@ -18954,6 +18992,8 @@ with pkgs;
libyubikey = callPackage ../development/libraries/libyubikey { };
+ libyuv = callPackage ../development/libraries/libyuv { };
+
libzapojit = callPackage ../development/libraries/libzapojit { };
libzen = callPackage ../development/libraries/libzen { };
@@ -19986,6 +20026,8 @@ with pkgs;
shhopt = callPackage ../development/libraries/shhopt { };
+ shine = callPackage ../development/libraries/shine { };
+
graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
s2n-tls = callPackage ../development/libraries/s2n-tls { };
@@ -23270,6 +23312,7 @@ with pkgs;
buildUBoot
ubootTools
ubootA20OlinuxinoLime
+ ubootA20OlinuxinoLime2EMMC
ubootBananaPi
ubootBananaPim3
ubootBananaPim64
@@ -23818,6 +23861,8 @@ with pkgs;
layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { };
+ layan-kde = callPackage ../data/themes/layan-kde { };
+
lato = callPackage ../data/fonts/lato {};
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
@@ -25440,6 +25485,8 @@ with pkgs;
haruna = libsForQt5.callPackage ../applications/video/haruna { };
+ hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
+
helix = callPackage ../applications/editors/helix { };
icesl = callPackage ../applications/misc/icesl { };
@@ -25796,6 +25843,7 @@ with pkgs;
};
wireshark-qt = wireshark;
+ tshark = wireshark-cli;
wireshark-cli = wireshark.override {
withQt = false;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
@@ -27928,7 +27976,7 @@ with pkgs;
navipowm = callPackage ../applications/misc/navipowm { };
netbeans = callPackage ../applications/editors/netbeans {
- jdk = jdk11;
+ jdk = jdk17;
};
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
@@ -28835,6 +28883,8 @@ with pkgs;
styx = callPackage ../applications/misc/styx { };
+ sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { };
+
tecoc = callPackage ../applications/editors/tecoc { };
viber = callPackage ../applications/networking/instant-messengers/viber { };
@@ -29000,6 +29050,8 @@ with pkgs;
spotifywm = callPackage ../applications/audio/spotifywm { };
+ psst = callPackage ../applications/audio/psst { };
+
squeezelite = callPackage ../applications/audio/squeezelite { };
ltunify = callPackage ../tools/misc/ltunify { };
@@ -33086,6 +33138,8 @@ with pkgs;
dump = callPackage ../tools/backup/dump { };
+ dxvk = callPackage ../misc/dxvk { };
+
ecdsatool = callPackage ../tools/security/ecdsatool { };
emulationstation = callPackage ../applications/emulators/emulationstation { };
@@ -33620,6 +33674,8 @@ with pkgs;
DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
+ i3a = callPackage ../misc/i3a { };
+
lkproof = callPackage ../tools/typesetting/tex/lkproof { };
lice = python3Packages.callPackage ../tools/misc/lice {};
diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix
index 5f043faecf..9e254ee64a 100644
--- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix
+++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix
@@ -92,14 +92,7 @@ in {
rpiVersion = 4;
};
- linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
- kernelPatches =
- [ kernelPatches.bridge_stp_helper
- kernelPatches.request_key_helper_updated
- kernelPatches.cpu-cgroup-v2."4.4"
- kernelPatches.modinst_arg_list_too_long
- ];
- };
+ linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream";
linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
kernelPatches =
@@ -484,7 +477,7 @@ in {
vanillaPackages = {
# recurse to build modules for the kernels
- linux_4_4 = recurseIntoAttrs (packagesFor kernels.linux_4_4);
+ linux_4_4 = throw "linux 4.4 was removed because it reached its end of life upstream"; # Added 2022-02-11
linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9);
linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14);
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index bf8a055e1a..c883066ced 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -390,6 +390,29 @@ let
ff-pbt = callPackage ../development/ocaml-modules/ff/pbt.nix { };
ff-sig = callPackage ../development/ocaml-modules/ff/sig.nix { };
+ ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
+ ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
+ inherit (pkgs) ffmpeg;
+ };
+ ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
+ inherit (pkgs) ffmpeg;
+ };
+
fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { };
fileutils = callPackage ../development/ocaml-modules/fileutils { };
@@ -398,6 +421,10 @@ let
fix = callPackage ../development/ocaml-modules/fix { };
+ flac = callPackage ../development/ocaml-modules/flac {
+ inherit (pkgs) flac;
+ };
+
fmt = callPackage ../development/ocaml-modules/fmt { };
fontconfig = callPackage ../development/ocaml-modules/fontconfig {
@@ -1001,6 +1028,8 @@ let
optint = callPackage ../development/ocaml-modules/optint { };
+ opus = callPackage ../development/ocaml-modules/opus { };
+
otfm = callPackage ../development/ocaml-modules/otfm { };
otoml = callPackage ../development/ocaml-modules/otoml { };
@@ -1081,10 +1110,18 @@ let
seq = callPackage ../development/ocaml-modules/seq { };
+ shine = callPackage ../development/ocaml-modules/shine {
+ inherit (pkgs) shine;
+ };
+
sosa = callPackage ../development/ocaml-modules/sosa { };
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
+ speex = callPackage ../development/ocaml-modules/speex {
+ inherit (pkgs) speex;
+ };
+
tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { };
tar = callPackage ../development/ocaml-modules/tar { };
@@ -1133,6 +1170,8 @@ let
ocurl = callPackage ../development/ocaml-modules/ocurl { };
+ ogg = callPackage ../development/ocaml-modules/ogg { };
+
parany = callPackage ../development/ocaml-modules/parany { };
pipebang = callPackage ../development/ocaml-modules/pipebang { };
@@ -1349,6 +1388,8 @@ let
tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { };
tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { };
+ theora = callPackage ../development/ocaml-modules/theora { };
+
toml = callPackage ../development/ocaml-modules/toml { };
topkg = callPackage ../development/ocaml-modules/topkg { };
@@ -1394,6 +1435,8 @@ let
vlq = callPackage ../development/ocaml-modules/vlq { };
+ vorbis = callPackage ../development/ocaml-modules/vorbis { };
+
visitors = callPackage ../development/ocaml-modules/visitors { };
wasm = callPackage ../development/ocaml-modules/wasm { };
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index d6745c559e..943ad79cc2 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -17611,8 +17611,8 @@ let
pname = "PDF-API2";
version = "2.042";
src = fetchurl {
- url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.038.tar.gz";
- sha256 = "dEfEdJsCp4T1JdPH7OmdNLChBHXbZQlvYxZ0jdL5vQk=";
+ url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.042.tar.gz";
+ sha256 = "0p9wsnn60mcxr4032ahai0d56x8gw76ydym2l4qxq086a10jk6db";
};
buildInputs = [ TestException TestMemoryCycle ];
propagatedBuildInputs = [ FontTTF ];
diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
index 44c5c11ceb..2ac1f83917 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
@@ -96,6 +96,7 @@ mapAliases ({
python-subunit = subunit; # added 2021-09-10
pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
+ pytwitchapi = twitchapi; # added 2022-03-07
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index b72a6fb062..5ba7835d41 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -1519,6 +1519,8 @@ in {
coqpit = callPackage ../development/python-modules/coqpit { };
+ coqui-trainer = callPackage ../development/python-modules/coqui-trainer {};
+
cepa = callPackage ../development/python-modules/cepa { };
cerberus = callPackage ../development/python-modules/cerberus { };
@@ -4476,6 +4478,8 @@ in {
kinparse = callPackage ../development/python-modules/kinparse { };
+ kiss-headers = callPackage ../development/python-modules/kiss-headers { };
+
kitchen = callPackage ../development/python-modules/kitchen { };
kivy = callPackage ../development/python-modules/kivy {
@@ -6717,6 +6721,8 @@ in {
pycec = callPackage ../development/python-modules/pycec { };
+ pycep-parser = callPackage ../development/python-modules/pycep-parser { };
+
pycfdns = callPackage ../development/python-modules/pycfdns { };
pycflow2dot = callPackage ../development/python-modules/pycflow2dot {
@@ -8275,6 +8281,8 @@ in {
python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
+ python-zbar = callPackage ../development/python-modules/python-zbar { };
+
pythran = callPackage ../development/python-modules/pythran {
inherit (pkgs.llvmPackages) openmp;
};
@@ -8341,8 +8349,6 @@ in {
pytweening = callPackage ../development/python-modules/pytweening { };
- pytwitchapi = callPackage ../development/python-modules/pytwitchapi { };
-
pytz = callPackage ../development/python-modules/pytz { };
pytz-deprecation-shim = callPackage ../development/python-modules/pytz-deprecation-shim { };
@@ -9196,6 +9202,8 @@ in {
simpy = callPackage ../development/python-modules/simpy { };
+ single-version = callPackage ../development/python-modules/single-version { };
+
signify = callPackage ../development/python-modules/signify { };
siosocks = callPackage ../development/python-modules/siosocks { };
@@ -9898,6 +9906,8 @@ in {
tgcrypto = callPackage ../development/python-modules/tgcrypto { };
+ theano-pymc = callPackage ../development/python-modules/theano-pymc { };
+
Theano = callPackage ../development/python-modules/Theano rec {
cudaSupport = pkgs.config.cudaSupport or false;
cudnnSupport = cudaSupport;