diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md
index d266a032268c..47035551d418 100644
--- a/doc/languages-frameworks/ocaml.section.md
+++ b/doc/languages-frameworks/ocaml.section.md
@@ -32,9 +32,9 @@ Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes
Here is a simple package example.
-- It defines an (optional) attribute `minimalOCamlVersion` that will be used to
- throw a descriptive evaluation error if building with an older OCaml is
- attempted.
+- It defines an (optional) attribute `minimalOCamlVersion` (see note below)
+ that will be used to throw a descriptive evaluation error if building with
+ an older OCaml is attempted.
- It uses the `fetchFromGitHub` fetcher to get its source.
@@ -117,3 +117,11 @@ buildDunePackage rec {
};
}
```
+
+Note about `minimalOCamlVersion`. A deprecated version of this argument was
+spelled `minimumOCamlVersion`; setting the old attribute wrongly modifies the
+derivation hash and is therefore inappropriate. As a technical dept, currently
+packaged libraries may still use the old spelling: maintainers are invited to
+fix this when updating packages. Massive renaming is strongly discouraged as it
+would be challenging to review, difficult to test, and will cause unnecessary
+rebuild.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1c92eb811bbf..6ae60956ae97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3545,7 +3545,7 @@
name = "Leo Maroni";
};
emmanuelrosa = {
- email = "emmanuel_rosa@aol.com";
+ email = "emmanuelrosa@protonmail.com";
matrix = "@emmanuelrosa:matrix.org";
github = "emmanuelrosa";
githubId = 13485450;
@@ -5984,6 +5984,13 @@
githubId = 107689;
name = "Josh Holland";
};
+ jsierles = {
+ email = "joshua@hey.com";
+ matrix = "@jsierles:matrix.org";
+ name = "Joshua Sierles";
+ github = "jsierles";
+ githubId = 82;
+ };
jtcoolen = {
email = "jtcoolen@pm.me";
name = "Julien Coolen";
@@ -6061,6 +6068,16 @@
githubId = 2396926;
name = "Justin Woo";
};
+ jvanbruegge = {
+ email = "supermanitu@gmail.com";
+ github = "jvanbruegge";
+ githubId = 1529052;
+ name = "Jan van Brügge";
+ keys = [{
+ longkeyid = "rsa4096/0x366572BE7D6C78A2";
+ fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2";
+ }];
+ };
jwatt = {
email = "jwatt@broken.watch";
github = "jjwatt";
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
index 4c399586eb52..a1431859ff59 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
@@ -5,7 +5,7 @@ when developing or debugging a test:
```ShellSession
$ nix-build . -A nixosTests.login.driverInteractive
-$ ./result/bin/nixos-test-driver --interactive
+$ ./result/bin/nixos-test-driver
[...]
>>>
```
@@ -28,7 +28,7 @@ You can re-use the VM states coming from a previous run by setting the
`--keep-vm-state` flag.
```ShellSession
-$ ./result/bin/nixos-test-driver --interactive --keep-vm-state
+$ ./result/bin/nixos-test-driver --keep-vm-state
```
The machine state is stored in the `$TMPDIR/vm-state-machinename`
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
index 8348ab56deb3..0e47350a0d24 100644
--- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
+++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
@@ -6,7 +6,7 @@
$ nix-build . -A nixosTests.login.driverInteractive
-$ ./result/bin/nixos-test-driver --interactive
+$ ./result/bin/nixos-test-driver
[...]
>>>
@@ -30,7 +30,7 @@ $ ./result/bin/nixos-test-driver --interactive
the --keep-vm-state flag.
-$ ./result/bin/nixos-test-driver --interactive --keep-vm-state
+$ ./result/bin/nixos-test-driver --keep-vm-state
The machine state is stored in the
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 436157515ebe..9f5279732fe4 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -712,6 +712,15 @@
warning.
+
+
+ programs.tmux has a new option
+ plugins that accepts a list of packages
+ from the tmuxPlugins group. The specified
+ packages are added to the system and loaded by
+ tmux.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 9d919711cb7f..629672259b21 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -243,4 +243,6 @@ In addition to numerous new and upgraded packages, this release has the followin
Reason is that the old name has been deprecated upstream.
Using the old option name will still work, but produce a warning.
+- `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`.
+
diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py
index 5477ab5cd038..61d91c9ed654 100755
--- a/nixos/lib/test-driver/test_driver/__init__.py
+++ b/nixos/lib/test-driver/test_driver/__init__.py
@@ -33,6 +33,22 @@ class EnvDefault(argparse.Action):
setattr(namespace, self.dest, values)
+def writeable_dir(arg: str) -> Path:
+ """Raises an ArgumentTypeError if the given argument isn't a writeable directory
+ Note: We want to fail as early as possible if a directory isn't writeable,
+ since an executed nixos-test could fail (very late) because of the test-driver
+ writing in a directory without proper permissions.
+ """
+ path = Path(arg)
+ if not path.is_dir():
+ raise argparse.ArgumentTypeError("{0} is not a directory".format(path))
+ if not os.access(path, os.W_OK):
+ raise argparse.ArgumentTypeError(
+ "{0} is not a writeable directory".format(path)
+ )
+ return path
+
+
def main() -> None:
arg_parser = argparse.ArgumentParser(prog="nixos-test-driver")
arg_parser.add_argument(
@@ -45,7 +61,7 @@ def main() -> None:
"-I",
"--interactive",
help="drop into a python repl and run the tests interactively",
- action="store_true",
+ action=argparse.BooleanOptionalAction,
)
arg_parser.add_argument(
"--start-scripts",
@@ -63,6 +79,14 @@ def main() -> None:
nargs="*",
help="vlans to span by the driver",
)
+ arg_parser.add_argument(
+ "-o",
+ "--output_directory",
+ help="""The path to the directory where outputs copied from the VM will be placed.
+ By e.g. Machine.copy_from_vm or Machine.screenshot""",
+ default=Path.cwd(),
+ type=writeable_dir,
+ )
arg_parser.add_argument(
"testscript",
action=EnvDefault,
@@ -77,7 +101,11 @@ def main() -> None:
rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state")
with Driver(
- args.start_scripts, args.vlans, args.testscript.read_text(), args.keep_vm_state
+ args.start_scripts,
+ args.vlans,
+ args.testscript.read_text(),
+ args.output_directory.resolve(),
+ args.keep_vm_state,
) as driver:
if args.interactive:
ptpython.repl.embed(driver.test_symbols(), {})
@@ -94,7 +122,7 @@ def generate_driver_symbols() -> None:
in user's test scripts. That list is then used by pyflakes to lint those
scripts.
"""
- d = Driver([], [], "")
+ d = Driver([], [], "", Path())
test_symbols = d.test_symbols()
with open("driver-symbols", "w") as fp:
fp.write(",".join(test_symbols.keys()))
diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
index 49a42fe5fb4e..880b1c5fdec0 100644
--- a/nixos/lib/test-driver/test_driver/driver.py
+++ b/nixos/lib/test-driver/test_driver/driver.py
@@ -10,6 +10,28 @@ from test_driver.vlan import VLan
from test_driver.polling_condition import PollingCondition
+def get_tmp_dir() -> Path:
+ """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD
+ Raises an exception in case the retrieved temporary directory is not writeable
+ See https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir
+ """
+ tmp_dir = Path(tempfile.gettempdir())
+ tmp_dir.mkdir(mode=0o700, exist_ok=True)
+ if not tmp_dir.is_dir():
+ raise NotADirectoryError(
+ "The directory defined by TMPDIR, TEMP, TMP or CWD: {0} is not a directory".format(
+ tmp_dir
+ )
+ )
+ if not os.access(tmp_dir, os.W_OK):
+ raise PermissionError(
+ "The directory defined by TMPDIR, TEMP, TMP, or CWD: {0} is not writeable".format(
+ tmp_dir
+ )
+ )
+ return tmp_dir
+
+
class Driver:
"""A handle to the driver that sets up the environment
and runs the tests"""
@@ -24,12 +46,13 @@ class Driver:
start_scripts: List[str],
vlans: List[int],
tests: str,
+ out_dir: Path,
keep_vm_state: bool = False,
):
self.tests = tests
+ self.out_dir = out_dir
- tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir()))
- tmp_dir.mkdir(mode=0o700, exist_ok=True)
+ tmp_dir = get_tmp_dir()
with rootlog.nested("start all VLans"):
self.vlans = [VLan(nr, tmp_dir) for nr in vlans]
@@ -47,6 +70,7 @@ class Driver:
name=cmd.machine_name,
tmp_dir=tmp_dir,
callbacks=[self.check_polling_conditions],
+ out_dir=self.out_dir,
)
for cmd in cmd(start_scripts)
]
@@ -141,8 +165,8 @@ class Driver:
"Using legacy create_machine(), please instantiate the"
"Machine class directly, instead"
)
- tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir()))
- tmp_dir.mkdir(mode=0o700, exist_ok=True)
+
+ tmp_dir = get_tmp_dir()
if args.get("startCommand"):
start_command: str = args.get("startCommand", "")
@@ -154,6 +178,7 @@ class Driver:
return Machine(
tmp_dir=tmp_dir,
+ out_dir=self.out_dir,
start_command=cmd,
name=name,
keep_vm_state=args.get("keep_vm_state", False),
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index e050cbd7d990..a41c419ebe6a 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -297,6 +297,7 @@ class Machine:
the machine lifecycle with the help of a start script / command."""
name: str
+ out_dir: Path
tmp_dir: Path
shared_dir: Path
state_dir: Path
@@ -325,6 +326,7 @@ class Machine:
def __init__(
self,
+ out_dir: Path,
tmp_dir: Path,
start_command: StartCommand,
name: str = "machine",
@@ -332,6 +334,7 @@ class Machine:
allow_reboot: bool = False,
callbacks: Optional[List[Callable]] = None,
) -> None:
+ self.out_dir = out_dir
self.tmp_dir = tmp_dir
self.keep_vm_state = keep_vm_state
self.allow_reboot = allow_reboot
@@ -702,10 +705,9 @@ class Machine:
self.connected = True
def screenshot(self, filename: str) -> None:
- out_dir = os.environ.get("out", os.getcwd())
word_pattern = re.compile(r"^\w+$")
if word_pattern.match(filename):
- filename = os.path.join(out_dir, "{}.png".format(filename))
+ filename = os.path.join(self.out_dir, "{}.png".format(filename))
tmp = "{}.ppm".format(filename)
with self.nested(
@@ -756,7 +758,6 @@ class Machine:
all the VMs (using a temporary directory).
"""
# Compute the source, target, and intermediate shared file names
- out_dir = Path(os.environ.get("out", os.getcwd()))
vm_src = Path(source)
with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
shared_temp = Path(shared_td)
@@ -766,7 +767,7 @@ class Machine:
# Copy the file to the shared directory inside VM
self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate]))
- abs_target = out_dir / target_dir / vm_src.name
+ abs_target = self.out_dir / target_dir / vm_src.name
abs_target.parent.mkdir(exist_ok=True, parents=True)
# Copy the file from the shared directory outside VM
if intermediate.is_dir():
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index a67040468136..0d3c3a89e783 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -30,7 +30,7 @@ rec {
# effectively mute the XMLLogger
export LOGFILE=/dev/null
- ${driver}/bin/nixos-test-driver
+ ${driver}/bin/nixos-test-driver -o $out
'';
passthru = driver.passthru // {
@@ -51,6 +51,7 @@ rec {
, enableOCR ? false
, skipLint ? false
, passthru ? {}
+ , interactive ? false
}:
let
# Reifies and correctly wraps the python test driver for
@@ -139,7 +140,8 @@ rec {
wrapProgram $out/bin/nixos-test-driver \
--set startScripts "''${vmStartScripts[*]}" \
--set testScript "$out/test-script" \
- --set vlans '${toString vlans}'
+ --set vlans '${toString vlans}' \
+ ${lib.optionalString (interactive) "--add-flags --interactive"}
'');
# Make a full-blown test
@@ -217,6 +219,7 @@ rec {
testName = name;
qemu_pkg = pkgs.qemu;
nodes = nodes pkgs.qemu;
+ interactive = true;
};
test =
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 80ec3126ca54..088f2af59e22 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -1,4 +1,4 @@
-{ config, pkgs ,lib ,... }:
+{ config, pkgs, lib, ... }:
with lib;
@@ -13,13 +13,13 @@ with lib;
options.xdg.portal = {
enable =
- mkEnableOption "xdg desktop integration"//{
+ mkEnableOption "xdg desktop integration" // {
default = false;
};
extraPortals = mkOption {
type = types.listOf types.package;
- default = [];
+ default = [ ];
description = ''
List of additional portals to add to path. Portals allow interaction
with system, like choosing files or taking screenshots. At minimum,
@@ -46,25 +46,36 @@ with lib;
let
cfg = config.xdg.portal;
packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
- joinedPortals = pkgs.symlinkJoin {
+ joinedPortals = pkgs.buildEnv {
name = "xdg-portals";
- paths = cfg.extraPortals;
+ paths = packages;
+ pathsToLink = [ "/share/xdg-desktop-portal/portals" "/share/applications" ];
};
- in mkIf cfg.enable {
+ in
+ mkIf cfg.enable {
assertions = [
- { assertion = (cfg.gtkUsePortal -> cfg.extraPortals != []);
- message = "Setting xdg.portal.gtkUsePortal to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde.";
+ {
+ assertion = cfg.extraPortals != [ ];
+ message = "Setting xdg.portal.enable to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde.";
}
];
- services.dbus.packages = packages;
+ services.dbus.packages = packages;
systemd.packages = packages;
- environment.sessionVariables = {
- GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1";
- XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals";
+ environment = {
+ # fixes screen sharing on plasmawayland on non-chromium apps by linking
+ # share/applications/*.desktop files
+ # see https://github.com/NixOS/nixpkgs/issues/145174
+ systemPackages = [ joinedPortals ];
+ pathsToLink = [ "/share/applications" ];
+
+ sessionVariables = {
+ GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1";
+ XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals";
+ };
};
};
}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4b2cb803e20e..c2b1e8866863 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -852,7 +852,6 @@
./services/networking/quassel.nix
./services/networking/quorum.nix
./services/networking/quicktun.nix
- ./services/networking/racoon.nix
./services/networking/radicale.nix
./services/networking/radvd.nix
./services/networking/rdnssd.nix
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index c39908751d29..74b3fbd9ac06 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -52,6 +52,12 @@ let
set -s escape-time ${toString cfg.escapeTime}
set -g history-limit ${toString cfg.historyLimit}
+ ${lib.optionalString (cfg.plugins != []) ''
+ # Run plugins
+ ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins}
+
+ ''}
+
${cfg.extraConfig}
'';
@@ -165,6 +171,13 @@ in {
downside it doesn't survive user logout.
'';
};
+
+ plugins = mkOption {
+ default = [];
+ type = types.listOf types.package;
+ description = "List of plugins to install.";
+ example = lib.literalExpression "[ pkgs.tmuxPlugins.nord ]";
+ };
};
};
@@ -174,7 +187,7 @@ in {
environment = {
etc."tmux.conf".text = tmuxConf;
- systemPackages = [ pkgs.tmux ];
+ systemPackages = [ pkgs.tmux ] ++ cfg.plugins;
variables = {
TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}'';
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b9a2f47f3f5a..81843dc0f90a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -80,6 +80,9 @@ with lib;
libinput and synaptics.
'')
(mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream")
+ (mkRemovedOptionModule [ "services" "racoon" ] ''
+ The racoon module has been removed, because the software project was abandoned upstream.
+ '')
# Do NOT add any option renames here, see top of the file
];
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 16011573f8bb..28b8be7a9a0d 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -9,7 +9,7 @@ let
# On Nix level we don't attempt to precisely validate the address specifications.
# The optional IPv6 scope spec comes *after* port, perhaps surprisingly.
mkListen = kind: addr: let
- al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr;
+ al_v4 = builtins.match "([0-9.]+):([0-9]+)($)" addr;
al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr;
al_portOnly = builtins.match "([0-9]+)" addr;
al = findFirst (a: a != null)
diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix
deleted file mode 100644
index 328f4cb1497f..000000000000
--- a/nixos/modules/services/networking/racoon.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.racoon;
-in {
- options.services.racoon = {
- enable = mkEnableOption "racoon";
-
- config = mkOption {
- description = "Contents of racoon configuration file.";
- default = "";
- type = types.str;
- };
-
- configPath = mkOption {
- description = "Location of racoon config if config is not provided.";
- default = "/etc/racoon/racoon.conf";
- type = types.path;
- };
- };
-
- config = mkIf cfg.enable {
- systemd.services.racoon = {
- description = "Racoon Daemon";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = {
- ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${
- if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config
- else cfg.configPath
- }";
- ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config";
- PIDFile = "/run/racoon.pid";
- Type = "forking";
- Restart = "always";
- };
- preStart = ''
- rm /run/racoon.pid || true
- mkdir -p /var/racoon
- '';
- };
- };
-}
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 325f6f5b43f4..436a375fb5eb 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -36,17 +36,6 @@ in {
Open vSwitch package to use.
'';
};
-
- ipsec = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to start racoon service for openvswitch.
- Supported only if openvswitch version is less than 2.6.0.
- Use virtualisation.vswitch.package = pkgs.openvswitch-lts
- for a version that supports ipsec over GRE.
- '';
- };
};
config = mkIf cfg.enable (let
@@ -65,7 +54,7 @@ in {
installPhase = "mkdir -p $out";
};
- in (mkMerge [{
+ in {
environment.systemPackages = [ cfg.package ];
boot.kernelModules = [ "tun" "openvswitch" ];
@@ -142,48 +131,14 @@ in {
};
};
- }
- (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) {
- environment.systemPackages = [ pkgs.ipsecTools ];
+ });
- services.racoon.enable = true;
- services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf";
-
- networking.firewall.extraCommands = ''
- iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1
- iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1
- '';
-
- systemd.services.ovs-monitor-ipsec = {
- description = "Open_vSwitch Ipsec Daemon";
- wantedBy = [ "multi-user.target" ];
- requires = [ "ovsdb.service" ];
- before = [ "vswitchd.service" "racoon.service" ];
- environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
- serviceConfig = {
- ExecStart = ''
- ${cfg.package}/bin/ovs-monitor-ipsec \
- --root-prefix ${runDir}/ipsec \
- --pidfile /run/openvswitch/ovs-monitor-ipsec.pid \
- --monitor --detach \
- unix:/run/openvswitch/db.sock
- '';
- PIDFile = "/run/openvswitch/ovs-monitor-ipsec.pid";
- # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready.
- Type = "forking";
- };
-
- preStart = ''
- rm -r ${runDir}/ipsec/etc/racoon/certs || true
- mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/}
- ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey
- ln -fs ${pkgs.writeScript "racoon-restart" ''
- #!${pkgs.runtimeShell}
- /run/current-system/sw/bin/systemctl $1 racoon
- ''} ${runDir}/ipsec/etc/init.d/racoon
- '';
- };
- })]));
+ imports = [
+ (mkRemovedOptionModule [ "virtualisation" "vswitch" "ipsec" ] ''
+ OpenVSwitch IPSec functionality has been removed, because it depended on racoon,
+ which was removed from nixpkgs, because it was abanoded upstream.
+ '')
+ ];
meta.maintainers = with maintainers; [ netixx ];
diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix
index 10cbd6d9038c..af8230553bbb 100644
--- a/nixos/tests/geth.nix
+++ b/nixos/tests/geth.nix
@@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_for_open_port(18545)
machine.succeed(
- 'geth attach --exec "eth.chainId()" http://localhost:8545 | grep \'"0x0"\' '
+ 'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' '
)
machine.succeed(
diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix
index 17e9eeb869b0..ac2c996955c8 100644
--- a/nixos/tests/teeworlds.nix
+++ b/nixos/tests/teeworlds.nix
@@ -36,12 +36,12 @@ in {
client1.wait_for_x()
client2.wait_for_x()
- client1.execute("teeworlds 'player_name Alice;connect server'&")
+ client1.execute("teeworlds 'player_name Alice;connect server' >&2 &")
server.wait_until_succeeds(
'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Alice"'
)
- client2.execute("teeworlds 'player_name Bob;connect server'&")
+ client2.execute("teeworlds 'player_name Bob;connect server' >&2 &")
server.wait_until_succeeds(
'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Bob"'
)
diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix
index 3338fe40bf17..d03b7836f2ae 100644
--- a/pkgs/applications/audio/cyanrip/default.nix
+++ b/pkgs/applications/audio/cyanrip/default.nix
@@ -12,13 +12,13 @@
}:
stdenv.mkDerivation rec {
pname = "cyanrip";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "cyanreg";
repo = pname;
rev = "v${version}";
- sha256 = "0lgb92sfpf4w3nj5vlj6j7931mj2q3cmcx1app9snf853jk9ahmw";
+ sha256 = "1aip52bwkq8cb1d8ifyv2m6m5dz7jk6qmbhyb97yyf4nhxv445ky";
};
nativeBuildInputs = [ meson ninja pkg-config ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/cyanreg/cyanrip";
description = "Bule-ish CD ripper";
- license = licenses.lgpl3Plus;
+ license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = [ maintainers.zane ];
};
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 7cec1025611f..03cc0b35b8d3 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -113,8 +113,10 @@ in
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'';
- # For treesitter plugins, libstdc++.so.6 will be needed
- NIX_LDFLAGS = [ "-lstdc++"];
+ # For treesitter plugins, libstdc++.so.6, or equivalent will be needed
+ NIX_LDFLAGS =
+ lib.optionals stdenv.cc.isGNU [ "-lstdc++"]
+ ++ lib.optionals stdenv.cc.isClang [ "-lc++" ];
# export PATH=$PWD/build/bin:${PATH}
shellHook=''
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 09c1fddbda21..16e6a818e5ae 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,24 +1,25 @@
{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
-, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
-, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
+, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
+, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid
+, zstd, pdal, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "grass";
- version = "7.6.1";
+ version = "7.8.6";
src = with lib; fetchFromGitHub {
owner = "OSGeo";
repo = "grass";
- rev = "${name}_${replaceStrings ["."] ["_"] version}";
- sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll";
+ rev = version;
+ sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM=";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
- readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
- libLAS proj-datumgrid ]
- ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]);
+ buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
+ readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
+ libLAS proj-datumgrid zstd pdal wrapGAppsHook ]
+ ++ (with python3Packages; [ python python-dateutil wxPython_4_1 numpy ]);
# On Darwin the installer tries to symlink the help files into a system
# directory
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
"--with-readline"
"--with-wxwidgets"
"--with-netcdf"
+ "--with-pdal"
"--with-geos"
"--with-postgres"
"--with-postgres-libs=${postgresql.lib}/lib/"
@@ -46,6 +48,9 @@ stdenv.mkDerivation rec {
"--with-mysql-libs=${libmysqlclient}/lib/mysql"
"--with-blas"
"--with-liblas=${libLAS}/bin/liblas-config"
+ "--with-zstd"
+ "--with-fftw"
+ "--with-pthread"
];
# Otherwise a very confusing "Can't load GDAL library" error
@@ -62,6 +67,7 @@ stdenv.mkDerivation rec {
scripts/g.extension.all/g.extension.all.py \
scripts/r.drain/r.drain.py \
scripts/r.pack/r.pack.py \
+ scripts/r.import/r.import.py \
scripts/r.tileset/r.tileset.py \
scripts/r.unpack/r.unpack.py \
scripts/v.clip/v.clip.py \
@@ -79,18 +85,17 @@ stdenv.mkDerivation rec {
temporal/t.rast.algebra/t.rast.algebra.py \
temporal/t.rast3d.algebra/t.rast3d.algebra.py \
temporal/t.vect.algebra/t.vect.algebra.py \
+ temporal/t.downgrade/t.downgrade.py \
temporal/t.select/t.select.py
for d in gui lib scripts temporal tools; do
patchShebangs $d
done
'';
- NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
-
postInstall = ''
- wrapProgram $out/bin/grass76 \
+ wrapProgram $out/bin/grass78 \
--set PYTHONPATH $PYTHONPATH \
- --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \
+ --set GRASS_PYTHON ${python3Packages.python.interpreter} \
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
ln -s $out/grass*/lib $out/lib
ln -s $out/grass*/include $out/include
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index f272fd04dd0d..b3220f8d7081 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,17 +1,21 @@
{ lib, makeWrapper, symlinkJoin
-, qgis-unwrapped, extraPythonPackages ? (ps: [ ])
+, extraPythonPackages ? (ps: [ ])
+, libsForQt5
}:
with lib;
-symlinkJoin rec {
+let
+ qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { };
+in symlinkJoin rec {
+
inherit (qgis-unwrapped) version;
name = "qgis-${version}";
paths = [ qgis-unwrapped ];
- nativeBuildInputs = [ makeWrapper qgis-unwrapped.python3Packages.wrapPython ];
+ nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ];
# extend to add to the python environment of QGIS without rebuilding QGIS application.
- pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.python3Packages);
+ pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs);
postBuild = ''
# unpackPhase
@@ -23,5 +27,7 @@ symlinkJoin rec {
--set PYTHONPATH $program_PYTHONPATH
'';
+ passthru.unwrapped = qgis-unwrapped;
+
meta = qgis-unwrapped.meta;
}
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix
new file mode 100644
index 000000000000..5db9a26ae758
--- /dev/null
+++ b/pkgs/applications/gis/qgis/ltr.nix
@@ -0,0 +1,32 @@
+{ lib, makeWrapper, symlinkJoin
+, extraPythonPackages ? (ps: [ ])
+, libsForQt5
+}:
+with lib;
+let
+ qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { };
+in symlinkJoin rec {
+
+ inherit (qgis-ltr-unwrapped) version;
+ name = "qgis-${version}";
+
+ paths = [ qgis-ltr-unwrapped ];
+
+ nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ];
+
+ # extend to add to the python environment of QGIS without rebuilding QGIS application.
+ pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs);
+
+ postBuild = ''
+
+ buildPythonPath "$pythonInputs"
+
+ wrapProgram $out/bin/qgis \
+ --prefix PATH : $program_PATH \
+ --set PYTHONPATH $program_PYTHONPATH
+ '';
+
+ passthru.unwrapped = qgis-ltr-unwrapped;
+
+ inherit (qgis-ltr-unwrapped) meta;
+}
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
new file mode 100644
index 000000000000..3de304f586fd
--- /dev/null
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -0,0 +1,148 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, ninja
+, flex
+, bison
+, proj
+, geos
+, xlibsWrapper
+, sqlite
+, gsl
+, qwt
+, fcgi
+, python3
+, libspatialindex
+, libspatialite
+, postgresql
+, txt2tags
+, openssl
+, libzip
+, hdf5
+, netcdf
+, exiv2
+, protobuf
+, qtbase
+, qtsensors
+, qca-qt5
+, qtkeychain
+, qt3d
+, qscintilla
+, qtserialport
+, qtxmlpatterns
+, withGrass ? true
+, grass
+, withWebKit ? true
+, qtwebkit
+, makeWrapper
+}:
+
+let
+
+ py = python3.override {
+ packageOverrides = self: super: {
+ pyqt5 = super.pyqt5.override {
+ withLocation = true;
+ };
+ };
+ };
+
+ pythonBuildInputs = with py.pkgs; [
+ qscintilla-qt5
+ gdal
+ jinja2
+ numpy
+ psycopg2
+ chardet
+ python-dateutil
+ pyyaml
+ pytz
+ requests
+ urllib3
+ pygments
+ pyqt5
+ sip_4
+ owslib
+ six
+ ];
+in mkDerivation rec {
+ version = "3.16.16";
+ pname = "qgis-ltr-unwrapped";
+
+ src = fetchFromGitHub {
+ owner = "qgis";
+ repo = "QGIS";
+ rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
+ sha256 = "85RlV1Ik1BeN9B7UE51ktTWMiGkMga2E/fnhyiVwjIs=";
+ };
+
+ passthru = {
+ inherit pythonBuildInputs;
+ inherit py;
+ };
+
+ buildInputs = [
+ openssl
+ proj
+ geos
+ xlibsWrapper
+ sqlite
+ gsl
+ qwt
+ exiv2
+ protobuf
+ fcgi
+ libspatialindex
+ libspatialite
+ postgresql
+ txt2tags
+ libzip
+ hdf5
+ netcdf
+ qtbase
+ qtsensors
+ qca-qt5
+ qtkeychain
+ qscintilla
+ qtserialport
+ qtxmlpatterns
+ qt3d
+ ] ++ lib.optional withGrass grass
+ ++ lib.optional withWebKit qtwebkit
+ ++ pythonBuildInputs;
+
+ nativeBuildInputs = [ makeWrapper cmake flex bison ninja ];
+
+ # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5
+ #
+ # TODO: Correct PyQt5 to provide the expected directory and fix
+ # build to use PYQT5_SIP_DIR consistently.
+ postPatch = ''
+ substituteInPlace cmake/FindPyQt5.py \
+ --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"'
+ '';
+
+ cmakeFlags = [
+ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
+ "-DWITH_3D=True"
+ "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
+ "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
+ ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
+ ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
+
+ postFixup = lib.optionalString withGrass ''
+ # grass has to be availble on the command line even though we baked in
+ # the path at build time using GRASS_PREFIX
+ wrapProgram $out/bin/qgis \
+ --prefix PATH : ${lib.makeBinPath [ grass ]}
+ '';
+
+ meta = with lib; {
+ description = "A Free and Open Source Geographic Information System";
+ homepage = "https://www.qgis.org";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ lsix sikmir erictapen ];
+ };
+}
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 14bafb6c51bc..816368bbabc6 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -12,7 +12,7 @@
, gsl
, qwt
, fcgi
-, python3Packages
+, python3
, libspatialindex
, libspatialite
, postgresql
@@ -27,6 +27,7 @@
, qtsensors
, qca-qt5
, qtkeychain
+, qt3d
, qscintilla
, qtserialport
, qtxmlpatterns
@@ -34,10 +35,22 @@
, grass
, withWebKit ? true
, qtwebkit
+, pdal
+, zstd
+, makeWrapper
}:
let
- pythonBuildInputs = with python3Packages; [
+
+ py = python3.override {
+ packageOverrides = self: super: {
+ pyqt5 = super.pyqt5.override {
+ withLocation = true;
+ };
+ };
+ };
+
+ pythonBuildInputs = with py.pkgs; [
qscintilla-qt5
gdal
jinja2
@@ -56,19 +69,19 @@ let
six
];
in mkDerivation rec {
- version = "3.16.14";
+ version = "3.22.3";
pname = "qgis-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "sha256-3FUGSBdlhJhhpTPtYuzKOznsC7PJV3kRL9Il2Yryi1Q=";
+ sha256 = "TLXhXHU0dp0MnKHFw/+1rQnJbebnwje21Oasy0qWctk=";
};
passthru = {
inherit pythonBuildInputs;
- inherit python3Packages;
+ inherit py;
};
buildInputs = [
@@ -96,11 +109,14 @@ in mkDerivation rec {
qscintilla
qtserialport
qtxmlpatterns
+ qt3d
+ pdal
+ zstd
] ++ lib.optional withGrass grass
++ lib.optional withWebKit qtwebkit
++ pythonBuildInputs;
- nativeBuildInputs = [ cmake flex bison ninja ];
+ nativeBuildInputs = [ makeWrapper cmake flex bison ninja ];
# Force this pyqt_sip_dir variable to point to the sip dir in PyQt5
#
@@ -108,15 +124,24 @@ in mkDerivation rec {
# build to use PYQT5_SIP_DIR consistently.
postPatch = ''
substituteInPlace cmake/FindPyQt5.py \
- --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"'
+ --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"'
'';
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
- "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
- "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
+ "-DWITH_3D=True"
+ "-DWITH_PDAL=TRUE"
+ "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
+ "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
- ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
+ ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78";
+
+ postFixup = lib.optionalString withGrass ''
+ # grass has to be availble on the command line even though we baked in
+ # the path at build time using GRASS_PREFIX
+ wrapProgram $out/bin/qgis \
+ --prefix PATH : ${lib.makeBinPath [ grass ]}
+ '';
meta = {
description = "A Free and Open Source Geographic Information System";
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 15faa7a32d75..237c91267839 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
- version = "0.99.44";
+ version = "0.99.45";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
- sha256 = "sha256-13wZb+PxeCrQ3MpewMnqBHO8QnoCRFhKU4awTdYtFd4=";
+ sha256 = "sha256-DGhzqv7huFVgCdXy3DuIBT+7s2q6FB7+gFPd4zEXi2M=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
deleted file mode 100644
index 03a9f875a793..000000000000
--- a/pkgs/applications/misc/fme/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoconf
-, automake
-, bc
-, fluxbox
-, gettext
-, glibmm
-, gtkmm2
-, libglademm
-, libsigcxx
-, pkg-config
-}:
-
-stdenv.mkDerivation rec {
- pname = "fme";
- version = "1.1.3";
-
- src = fetchFromGitHub {
- owner = "rdehouss";
- repo = "fme";
- rev = "v${version}";
- sha256 = "sha256-P67OmExBdWM6NZhDyYceVJOZiy8RC+njk/QvgQcWZeQ=";
- };
-
- nativeBuildInputs = [
- autoconf
- automake
- gettext
- pkg-config
- ];
- buildInputs = [
- bc
- fluxbox
- glibmm
- gtkmm2
- libglademm
- libsigcxx
- ];
-
- preConfigure = ''
- ./autogen.sh
- '';
-
- meta = with lib; {
- homepage = "https://github.com/rdehouss/fme/";
- description = "Editor for Fluxbox menus";
- longDescription = ''
- Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox
- written in C++ with the libraries Gtkmm, Glibmm, libglademm and gettext
- for internationalization. Its user-friendly interface will help you to
- edit, delete, move (Drag and Drop) a row, a submenu, etc very easily.
- '';
- license = licenses.gpl2Plus;
- maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix
index 01c8ade58c4b..4412af583b3e 100644
--- a/pkgs/applications/misc/metadata-cleaner/default.nix
+++ b/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
- version = "2.1.3";
+ version = "2.1.4";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = "metadata-cleaner";
rev = "v${version}";
- hash = "sha256-9sLjgqqQBXcudlBRmqAwWcWMUXoIUyAK272zaNKbJNY=";
+ hash = "sha256-46J0iLXzZX5tww4CK8WhrADql023rauO0fpW7Asn5ZY=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix
index 13e7c60f5192..15a7275bd80d 100644
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@@ -9,13 +9,13 @@
buildGoPackage rec {
pname = "mob";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
- sha256 = "sha256-nf0FSaUi8qX1f4Luo0cP4ZLoOKbyvgmpilMOWXbzzIM=";
+ sha256 = "sha256-1yE3KFGY51m6OL4LYrz+BSCHQSnbQRSpB3EUqAzSr+M=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix
index 86ba7dbe137a..3d7720d25968 100644
--- a/pkgs/applications/misc/rivercarro/default.nix
+++ b/pkgs/applications/misc/rivercarro/default.nix
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "rivercarro";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromSourcehut {
owner = "~novakane";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
- sha256 = "0h1wvl6rlrpr67zl51x71hy7nwkfd5kfv5p2mql6w5fybxxyqnpm";
+ sha256 = "07md837ki0yln464w8vgwyl3yjrvkz1p8alxlmwqfn4w45nqhw77";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 59d4a4ff7cee..2d9545bc13aa 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,23 +1,24 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }:
-buildGoModule rec {
+buildGo117Module rec {
pname = "helm";
- version = "3.7.2";
- gitCommit = "663a896f4a815053445eec4153677ddc24a0a361";
+ version = "3.8.0";
+ gitCommit = "d14138609b01886f544b2025f5000351c9eb092e";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "sha256-MhBuwpgF1PBAZ5QwF7t4J1gqam2cMX+hkdZs7KoSD6I=";
+ sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg=";
};
- vendorSha256 = "sha256-YDdpeVh9rG3MF1HgG7uuRvjXDr9Fcjuhrj16kpK8tsI=";
+ vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc=";
doCheck = false;
subPackages = [ "cmd/helm" ];
ldflags = [
- "-w" "-s"
+ "-w"
+ "-s"
"-X helm.sh/helm/v3/internal/version.version=v${version}"
"-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}"
];
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index 1340133e7111..02ed9b96f546 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "sha256-oMf60mxreBSlgxVInTFM8kozYVZz5RdgzV3rYUnadnA=";
+ sha256 = "sha256-6eVFyGVvOUr5RA5jeavKcLJedv4jOGXAg3aa4N3cNx8=";
};
- vendorSha256 = "sha256-e8qh8J745TXUo6c1uMS8GyawEG9YFlMYl/nHpWIFK1Q=";
+ vendorSha256 = "sha256-ie7XRu+2+NmhMNtJEL2OgZH6wuTPJX9O2+cZBnI04JA=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 453ecda47846..9b40f636bcb8 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.24.0";
+ version = "1.25.1";
- vendorSha256 = "sha256-jFE4aHHgVmVcQu8eH97h9P3zchtmKv/KUIfv7f2ws3I=";
+ vendorSha256 = "sha256-MnyXePsnhb1Tl76uAtVW/DLacE0etXREGsapgNiZbMo=";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "sha256-WW5VVjm7cq/3/RGiIE2nn8O+VK0RHCtKkrlboIzhqC4=";
+ sha256 = "sha256-pRNOVN9u27im9fkUawJYjuGHTW0N7L5oJa3fQ6DUO+4=";
};
nativeBuildInputs = [ installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index c256f23dbc9c..1d2fdea35d0d 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub }:
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
-let rev = "237bd35906f5c4bed1f4de4aa58cc6a6a676d4fd";
+let rev = "0665cd322b11bb40c2774776de765c38d8104bed";
in
buildGoModule rec {
pname = "sonobuoy";
- version = "0.55.1"; # Do not forget to update `rev` above
+ version = "0.56.0"; # Do not forget to update `rev` above
ldflags =
let t = "github.com/vmware-tanzu/sonobuoy";
@@ -20,10 +20,10 @@ buildGoModule rec {
owner = "vmware-tanzu";
repo = "sonobuoy";
rev = "v${version}";
- sha256 = "sha256-pHpnh+6O9yjnDA8u0jyLvqNQbXC+xz8fRn47aQNdOAo=";
+ sha256 = "sha256-78skqo3sq567s3/XN54xtC0mefDY3Io3BD0d+JP7k5Q=";
};
- vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg=";
+ vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
new file mode 100644
index 000000000000..819bf4741aa0
--- /dev/null
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildGo117Module, fetchFromGitHub }:
+
+buildGo117Module rec {
+ pname = "talosctl";
+ version = "0.14.1";
+
+ src = fetchFromGitHub {
+ owner = "talos-systems";
+ repo = "talos";
+ rev = "v${version}";
+ sha256 = "sha256-JeZ+Q6LTDJtoxfu4mJNc3wv3Y6OPcIUvgnozj9mWwLw=";
+ };
+
+ vendorSha256 = "sha256-ujbEWvcNJJOUegVgAGEPwYF02TiqD1lZELvqc/Gmb4A=";
+
+ # look for GO_LDFLAGS getting set in the Makefile
+ ldflags =
+ let
+ versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG
+ imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS
+ mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG
+ in
+ [
+ "-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=v0.9.0-2-g447ce75" # PKGS
+ "-X ${versionPkg}.ExtrasVersion=v0.7.0-1-gd6b73a7" # EXTRAS
+ "-X ${imagesPkgs}.Username=talos-systems" # USERNAME
+ "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
+ "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
+ ];
+
+ subPackages = [ "cmd/talosctl" ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A CLI for out-of-band management of Kubernetes nodes created by Talos";
+ homepage = "https://github.com/talos-systems/talos";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ flokli ];
+ };
+}
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 20623ac31827..e91b517e8158 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,16 +21,33 @@
stdenv.mkDerivation rec {
pname = "zeek";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc";
+ sha256 = "sha256-jZoCjKn+x61KnkinY+KWBSOEz0AupM03FXe/8YPCdFE=";
};
- nativeBuildInputs = [ cmake flex bison file ];
- buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ]
- ++ lib.optionals stdenv.isDarwin [ gettext ];
+ nativeBuildInputs = [
+ bison
+ cmake
+ file
+ flex
+ ];
+
+ buildInputs = [
+ curl
+ gperftools
+ libmaxminddb
+ libpcap
+ ncurses
+ openssl
+ python3
+ swig
+ zlib
+ ] ++ lib.optionals stdenv.isDarwin [
+ gettext
+ ];
outputs = [ "out" "lib" "py" ];
@@ -54,7 +71,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "Powerful network analysis framework much different from a typical IDS";
+ description = "Network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";
changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
license = licenses.bsd3;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 752fa7ba191f..a33980874553 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -28,11 +28,11 @@
}:
let
- version = "5.9.1.1380";
+ version = "5.9.3.1911";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
- sha256 = "0r1w13y3ks377hdyil9s68vn09vh22zl6ni4693fm7cf6q49ayyw";
+ sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4";
};
};
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index fd08817f026d..c196f6bdbda9 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -2,6 +2,7 @@
, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa
, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
+, makeWrapper
}:
let deps = [
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
dpkg
+ makeWrapper
];
buildInputs = deps;
@@ -73,12 +75,14 @@ stdenv.mkDerivation rec {
mv usr/bin/* $out/bin
mv opt/Mullvad\ VPN/* $out/share/mullvad
- sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop
-
ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report
+ wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1
+
+ sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop
+
runHook postInstall
'';
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 5427f42a7588..0f0410024251 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }:
+{ lib, stdenv, fetchurl, coreutils, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }:
# nettools needed for hostname
stdenv.mkDerivation rec {
@@ -73,6 +73,11 @@ stdenv.mkDerivation rec {
for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do
rm -rf $comp/x86*
done
+
+ substituteInPlace lib/Tools/env \
+ --replace /usr/bin/env ${coreutils}/bin/env
+
+ rm -r heaps
'' + (if ! stdenv.isLinux then "" else ''
arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do
@@ -83,6 +88,11 @@ stdenv.mkDerivation rec {
done
'');
+ buildPhase = ''
+ export HOME=$TMP # The build fails if home is not set
+ bin/isabelle build -v -o system_heaps -b HOL
+ '';
+
installPhase = ''
mkdir -p $out/bin
mv $TMP/$dirname $out
@@ -117,7 +127,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://isabelle.in.tum.de/";
license = licenses.bsd3;
- maintainers = [ maintainers.jwiegley ];
+ maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 3cb018b9a5db..b715c2fc33b3 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -6,7 +6,7 @@
# build
, cmake
, ctags
-, python2Packages
+, python3Packages
, swig
# math
, eigen
@@ -30,13 +30,13 @@
, lp_solve
, colpack
# extra support
-, pythonSupport ? true
+, pythonSupport ? false
, opencvSupport ? false
, opencv ? null
, withSvmLight ? false
}:
-assert pythonSupport -> python2Packages != null;
+assert pythonSupport -> python3Packages != null;
assert opencvSupport -> opencv != null;
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
nativeBuildInputs = [ cmake swig ctags ]
- ++ (with python2Packages; [ python jinja2 ply ]);
+ ++ (with python3Packages; [ python jinja2 ply ]);
buildInputs = [
eigen
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
nlopt
lp_solve
colpack
- ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ])
+ ] ++ lib.optionals pythonSupport (with python3Packages; [ python numpy ])
++ lib.optional opencvSupport opencv;
cmakeFlags = let
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
"-DENABLE_TESTING=${enableIf doCheck}"
"-DDISABLE_META_INTEGRATION_TESTS=ON"
"-DTRAVIS_DISABLE_META_CPP=ON"
- "-DPythonModular=${enableIf pythonSupport}"
+ "-DINTERFACE_PYTHON=${enableIf pythonSupport}"
"-DOpenCV=${enableIf opencvSupport}"
"-DUSE_SVMLIGHT=${enableIf withSvmLight}"
];
@@ -177,6 +177,12 @@ stdenv.mkDerivation rec {
rm -r $out/share
'';
+ postFixup = ''
+ # CMake incorrectly calculates library path from dev prefix
+ substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \
+ --replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/"
+ '';
+
meta = with lib; {
description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
homepage = "http://shogun-toolbox.org/";
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index 745a14e512d8..190ba1af23c1 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20220119140128";
+ version = "3.1.20220124184855";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
- sha256 = "1jmrm0qrqgka79avc1kq63fgh20gx6g07fc8p3iih4k85vhdyl3f";
+ sha256 = "0b0mxminfijbi3d9sslhwhs8awnagdsx8d2wh9x9ipdpwipihpmb";
};
postPatch = ''
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 1dfd47a3d381..87a05f146e9e 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,19 +1,20 @@
-{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4
-, cmake, makeWrapper, libjpeg, python2 }:
+{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew
+, qtbase, wrapQtAppsHook, python3
+, cmake, libjpeg }:
-let version = "5.2.1"; in
stdenv.mkDerivation rec {
pname = "tulip";
- inherit version;
+ version = "5.6.1";
src = fetchurl {
url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
- sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
+ sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw";
};
- buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ];
+ buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ];
+ nativeBuildInputs = [ cmake wrapQtAppsHook ];
- nativeBuildInputs = [ cmake makeWrapper ];
+ qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 48c4f6f2c4d7..4920372411f5 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "arakiken";
repo = pname;
- rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1
+ rev = version;
sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro=";
};
diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix
index fddffe6d198d..b8befad558d5 100644
--- a/pkgs/applications/version-management/commitizen/default.nix
+++ b/pkgs/applications/version-management/commitizen/default.nix
@@ -11,17 +11,24 @@
, pyyaml
, argcomplete
, typing-extensions
+, packaging
+, pytestCheckHook
+, pytest-freezegun
+, pytest-mock
+, pytest-regressions
+, git
}:
buildPythonApplication rec {
pname = "commitizen";
- version = "2.20.3";
+ version = "2.20.4";
src = fetchFromGitHub {
owner = "commitizen-tools";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rAm2GTRxZIHQmn/FM0IwwH/2h+oOvzGmeVr5xkvD/zA=";
+ sha256 = "sha256-2DhWiUAkAkyNxYB1CGzUB2nGZeCWvFqSztrxasUPSXw=";
+ deepClone = true;
};
format = "pyproject";
@@ -38,6 +45,59 @@ buildPythonApplication rec {
pyyaml
argcomplete
typing-extensions
+ packaging
+ ];
+
+ doCheck = true;
+ checkInputs = [
+ pytestCheckHook
+ pytest-freezegun
+ pytest-mock
+ pytest-regressions
+ argcomplete
+ git
+ ];
+
+ # NB: These require full git history
+ disabledTests = [
+ "test_breaking_change_content_v1"
+ "test_breaking_change_content_v1_beta"
+ "test_breaking_change_content_v1_multiline"
+ "test_bump_command_prelease"
+ "test_bump_dry_run"
+ "test_bump_files_only"
+ "test_bump_local_version"
+ "test_bump_major_increment"
+ "test_bump_minor_increment"
+ "test_bump_on_git_with_hooks_no_verify_disabled"
+ "test_bump_on_git_with_hooks_no_verify_enabled"
+ "test_bump_patch_increment"
+ "test_bump_tag_exists_raises_exception"
+ "test_bump_when_bumpping_is_not_support"
+ "test_bump_when_version_inconsistent_in_version_files"
+ "test_bump_with_changelog_arg"
+ "test_bump_with_changelog_config"
+ "test_bump_with_changelog_to_stdout_arg"
+ "test_changelog_config_flag_increment"
+ "test_changelog_config_start_rev_option"
+ "test_changelog_from_start"
+ "test_changelog_from_version_zero_point_two"
+ "test_changelog_hook"
+ "test_changelog_incremental_angular_sample"
+ "test_changelog_incremental_keep_a_changelog_sample"
+ "test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag"
+ "test_changelog_incremental_with_release_candidate_version"
+ "test_changelog_is_persisted_using_incremental"
+ "test_changelog_multiple_incremental_do_not_add_new_lines"
+ "test_changelog_replacing_unreleased_using_incremental"
+ "test_changelog_with_different_cz"
+ "test_get_commits"
+ "test_get_commits_author_and_email"
+ "test_get_commits_with_signature"
+ "test_get_latest_tag_name"
+ "test_is_staging_clean_when_updating_file"
+ "test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero"
+ "test_prevent_prerelease_when_no_increment_detected"
];
meta = with lib; {
diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix
index cf5608e66a02..0f7438e392ca 100644
--- a/pkgs/applications/video/lbry/default.nix
+++ b/pkgs/applications/video/lbry/default.nix
@@ -2,7 +2,7 @@
let
pname = "lbry-desktop";
- version = "0.50.2";
+ version = "0.52.0";
in appimageTools.wrapAppImage rec {
name = "${pname}-${version}";
@@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec {
src = fetchurl {
url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage";
# Gotten from latest-linux.yml
- sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg==";
+ sha512 = "FMsO1tUhym11hxot/0S4pXwjvt1YhOUahwiQU+HhOxrZhcrOwwyXUzMy3sAzKdZjidKpA5DbLjkgwPlg2kGWwg==";
};
};
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 1efebb6fdf55..7aa780f8a7f2 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
xcbutilkeysyms
xlibsWrapper
])
- ++ optional (!hostIsAarch) live555
+ ++ optional (!hostIsAarch && !onlyLibVLC) live555
++ optional jackSupport libjack2
++ optionals chromecastSupport [ libmicrodns protobuf ]
++ optionals skins2Support (with xorg; [
@@ -192,6 +192,16 @@ stdenv.mkDerivation rec {
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 {
+ url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch";
+ sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd";
+ })
+ (fetchpatch {
+ url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch";
+ sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda";
+ })
];
postPatch = ''
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 2164f16bd3ec..4a2ec178be2e 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- sha256 = "sha256-j2+ga+jnKnjnFGmrOOym99keLALg7wR7Jk+jjesiMc4=";
+ sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 8299304045d0..0a2febd0589f 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -254,5 +254,9 @@ stdenv.mkDerivation (rec {
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ eelco tstrobel oxij ];
license = lib.licenses.gpl2;
+ # https://xenbits.xen.org/docs/unstable/support-matrix.html
+ knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [
+ "This version of Xen has reached its end of life. See https://xenbits.xen.org/docs/unstable/support-matrix.html"
+ ];
} // (config.meta or {});
} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 5007e297267b..073ea45cbc9b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -48,12 +48,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
appstream
desktop-file-utils
@@ -95,6 +89,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Code editor designed for elementary OS";
homepage = "https://github.com/elementary/code";
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 8a9256f2a615..9b760515ff8f 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -24,11 +24,9 @@ stdenv.mkDerivation rec {
pname = "elementary-feedback";
version = "6.1.0";
- repoName = "feedback";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "feedback";
rev = version;
sha256 = "02wydbpa5qaa4xmmh4m7rbj4djbrn2i44zjakj5i6mzwjlj6sv5n";
};
@@ -42,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
gettext
meson
@@ -74,6 +66,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "GitHub Issue Reporter designed for elementary OS";
homepage = "https://github.com/elementary/feedback";
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 4b829321c37e..5f1d0e9e71fc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -33,7 +32,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
- version = "6.1.1";
+ version = "6.1.2";
outputs = [ "out" "dev" ];
@@ -41,18 +40,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
- sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";
+ sha256 = "sha256-g9g4wJXjjudk4Qt96XGUiV/X86Ae2lqhM+psh9h+XFE=";
};
- patches = [
- # Fix build with meson 0.61
- # https://github.com/elementary/files/pull/1973
- (fetchpatch {
- url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch";
- sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc=";
- })
- ];
-
nativeBuildInputs = [
desktop-file-utils
gettext
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index 58be49ab4bef..2963f98db40b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -26,24 +25,15 @@
stdenv.mkDerivation rec {
pname = "elementary-mail";
- version = "6.3.1";
+ version = "6.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "mail";
rev = version;
- sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";
+ sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
};
- patches = [
- # Fix build with meson 0.61
- # https://github.com/elementary/mail/pull/751
- (fetchpatch {
- url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch";
- sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44=";
- })
- ];
-
nativeBuildInputs = [
appstream
desktop-file-utils
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index cceeeabf15f1..d71835a6531a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -34,11 +34,9 @@ stdenv.mkDerivation rec {
pname = "elementary-music";
version = "5.1.1";
- repoName = "music";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "music";
rev = version;
sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n";
};
@@ -58,12 +56,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
desktop-file-utils
meson
@@ -108,6 +100,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Music player and library designed for elementary OS";
homepage = "https://github.com/elementary/music";
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index ca7b6fd3a7d1..12f6242eaafd 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -36,11 +36,9 @@ stdenv.mkDerivation rec {
pname = "elementary-photos";
version = "2.7.3";
- repoName = "photos";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "photos";
rev = version;
sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY=";
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
index 7ef0efaa49f1..f220db8868de 100644
--- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
- version = "6.1.0";
+ version = "6.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
- sha256 = "sha256-Gt9Hp9m28QdAFnKIT1xcbiSM5cn6kW7wEXmi/iFfu8k=";
+ sha256 = "sha256-eHaWXntLkk5G+cR5uFwWsIvbSPsbrvpglYBh91ta/M0=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index a065966ba1e3..d93b158168f9 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -32,12 +32,6 @@ stdenv.mkDerivation rec {
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
desktop-file-utils
gettext
@@ -66,6 +60,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
homepage = "https://github.com/elementary/sideload";
description = "Flatpak installer, designed for elementary OS";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index bcb7c39d17b4..152026e17a21 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -40,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -61,6 +55,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-a11y
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Universal Access Plug";
homepage = "https://github.com/elementary/switchboard-plug-a11y";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d48704736b1d..03964284ed73 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -29,11 +29,13 @@ stdenv.mkDerivation rec {
sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
+ patches = [
+ # Use NixOS's default wallpaper
+ (substituteAll {
+ src = ./fix-background-path.patch;
+ default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
+ })
+ ];
nativeBuildInputs = [
meson
@@ -53,13 +55,11 @@ stdenv.mkDerivation rec {
switchboard
];
- patches = [
- # Use NixOS's default wallpaper
- (substituteAll {
- src = ./fix-background-path.patch;
- default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
- })
- ];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
meta = with lib; {
description = "Switchboard About Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index d24b75502600..03fb7e9349bf 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Applications Plug";
homepage = "https://github.com/elementary/switchboard-plug-applications";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 764845c02022..53dc200a4345 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -35,12 +35,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-bluetooth # settings schema
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Bluetooth Plug";
homepage = "https://github.com/elementary/switchboard-plug-bluetooth";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 09717a584ce0..71bbda8edb17 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
patches = [
(substituteAll {
src = ./fix-paths.patch;
@@ -61,6 +55,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Date & Time Plug";
homepage = "https://github.com/elementary/switchboard-plug-datetime";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index c25188add450..4a7ce6f6d46d 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3sYZCazGnTjIi3Iry5673TMI13sD0GuY+46AK+NJH70=";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Displays Plug";
homepage = "https://github.com/elementary/switchboard-plug-display";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 01a3da26b1d5..1118d52fb43c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -40,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
libxml2
meson
@@ -67,6 +61,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Keyboard Plug";
homepage = "https://github.com/elementary/switchboard-plug-keyboard";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index a765eca6de2d..2c9b3833a0cc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -29,11 +29,12 @@ stdenv.mkDerivation rec {
sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ touchegg = touchegg;
+ })
+ ];
nativeBuildInputs = [
meson
@@ -54,12 +55,11 @@ stdenv.mkDerivation rec {
touchegg
];
- patches = [
- (substituteAll {
- src = ./fix-paths.patch;
- touchegg = touchegg;
- })
- ];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
meta = with lib; {
description = "Switchboard Mouse & Touchpad Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index b88f3f72d035..64a3083c6c2c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -27,11 +27,12 @@ stdenv.mkDerivation rec {
sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit networkmanagerapplet;
+ })
+ ];
nativeBuildInputs = [
meson
@@ -49,12 +50,11 @@ stdenv.mkDerivation rec {
switchboard
];
- patches = [
- (substituteAll {
- src = ./fix-paths.patch;
- inherit networkmanagerapplet;
- })
- ];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
meta = with lib; {
description = "Switchboard Networking Plug";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index fd5dfa328104..f142b8e9bb9c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Notifications Plug";
homepage = "https://github.com/elementary/switchboard-plug-notifications";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 16ed92b45d2d..2a531815f875 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -53,6 +47,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-power # settings schema
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Power Plug";
homepage = "https://github.com/elementary/switchboard-plug-power";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index dbca28038ab3..40b52affa036 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Printers Plug";
homepage = "https://github.com/elementary/switchboard-plug-printers";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index f41cfa2f7457..2a480bb9e257 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -33,12 +33,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -53,6 +47,12 @@ stdenv.mkDerivation rec {
switchboard
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Sharing Plug";
homepage = "https://github.com/elementary/switchboard-plug-sharing";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
index e31768c764d4..904278f983e0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
@@ -37,12 +37,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -62,6 +56,12 @@ stdenv.mkDerivation rec {
xorg.libXi
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Switchboard Wacom Plug";
homepage = "https://github.com/elementary/switchboard-plug-wacom";
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 50a3317d6e04..209fa1202f3b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
gettext
meson
@@ -73,6 +67,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Extensible System Settings app for Pantheon";
homepage = "https://github.com/elementary/switchboard";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index b76a874490ed..304e07749c85 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -12,11 +12,9 @@ stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.1";
- repoName = "stylesheet";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "stylesheet";
rev = version;
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
};
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 450275d1050d..40522bbf02a6 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.1.0";
- repoName = "icons";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "icons";
rev = version;
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
};
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index 6bad05693fea..2f326235c4cf 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -11,11 +11,9 @@ stdenv.mkDerivation rec {
pname = "elementary-sound-theme";
version = "1.1.0";
- repoName = "sound-theme";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "sound-theme";
rev = version;
sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
};
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index a96bba4ab115..393186325baf 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -17,11 +17,9 @@ stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "6.0.2";
- repoName = "default-settings";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "default-settings";
rev = version;
sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y=";
};
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 72df609c5a47..38de716394db 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -40,16 +40,32 @@ stdenv.mkDerivation rec {
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
-
- xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
- path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
- name = "io.elementary.greeter.desktop";
- }];
- };
+ patches = [
+ ./sysconfdir-install.patch
+ # Needed until https://github.com/elementary/greeter/issues/360 is fixed
+ (substituteAll {
+ src = ./hardcode-fallback-background.patch;
+ default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
+ })
+ # Revert "UserCard: use accent color for logged_in check (#566)"
+ # https://github.com/elementary/greeter/pull/566
+ # Fixes crash issue reported in:
+ # https://github.com/elementary/greeter/issues/578
+ # https://github.com/NixOS/nixpkgs/issues/151609
+ # Probably also fixes:
+ # https://github.com/elementary/greeter/issues/568
+ # https://github.com/elementary/greeter/issues/583
+ # https://github.com/NixOS/nixpkgs/issues/140513
+ # Revisit this when the greeter is ported to GTK 4:
+ # https://github.com/elementary/greeter/pull/591
+ ./revert-pr566.patch
+ # Fix build with meson 0.61
+ # https://github.com/elementary/greeter/pull/590
+ (fetchpatch {
+ url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
+ sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
+ })
+ ];
nativeBuildInputs = [
desktop-file-utils
@@ -84,21 +100,6 @@ stdenv.mkDerivation rec {
"-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed
];
- patches = [
- ./sysconfdir-install.patch
- # Needed until https://github.com/elementary/greeter/issues/360 is fixed
- (substituteAll {
- src = ./hardcode-fallback-background.patch;
- default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
- })
- # Fix build with meson 0.61
- # https://github.com/elementary/greeter/pull/590
- (fetchpatch {
- url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
- sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
- })
- ];
-
preFixup = ''
gappsWrapperArgs+=(
# dbus-launch needed in path
@@ -125,6 +126,17 @@ stdenv.mkDerivation rec {
--replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+
+ xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
+ path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
+ name = "io.elementary.greeter.desktop";
+ }];
+ };
+
meta = with lib; {
description = "LightDM Greeter for Pantheon";
homepage = "https://github.com/elementary/greeter";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch
new file mode 100644
index 000000000000..ed05ba24b86a
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch
@@ -0,0 +1,103 @@
+From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001
+From: Bobby Rong
+Date: Tue, 25 Jan 2022 10:03:31 +0800
+Subject: [PATCH] Revert "UserCard: use accent color for logged_in check
+ (#566)"
+
+This reverts commit 6f18c79c780582e43039032f6926816efa82e206.
+---
+ data/Check.css | 11 -----------
+ data/greeter.gresource.xml | 1 -
+ src/Cards/UserCard.vala | 29 +++--------------------------
+ 3 files changed, 3 insertions(+), 38 deletions(-)
+ delete mode 100644 data/Check.css
+
+diff --git a/data/Check.css b/data/Check.css
+deleted file mode 100644
+index 947db6b..0000000
+--- a/data/Check.css
++++ /dev/null
+@@ -1,11 +0,0 @@
+-check {
+- background-color: @accent_color;
+- border-radius: 99px;
+- color: white;
+- margin: 2px;
+- min-height: 20px;
+- min-width: 20px;
+- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7);
+- -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
+- -gtk-icon-transform: scale(0.6);
+-}
+diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml
+index 604c89a..ce9be29 100644
+--- a/data/greeter.gresource.xml
++++ b/data/greeter.gresource.xml
+@@ -2,7 +2,6 @@
+
+
+ Card.css
+- Check.css
+ DateTime.css
+ MainWindow.css
+
+diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
+index 83df22c..02d2b0a 100644
+--- a/src/Cards/UserCard.vala
++++ b/src/Cards/UserCard.vala
+@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
+ private Gtk.Stack login_stack;
+ private Greeter.PasswordEntry password_entry;
+
+- private unowned Gtk.StyleContext logged_in_context;
+ private weak Gtk.StyleContext main_grid_style_context;
+ private weak Gtk.StyleContext password_entry_context;
+
+@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard {
+ };
+ avatar_overlay.add (avatar);
+
+- var logged_in = new SelectionCheck () {
+- halign = Gtk.Align.END,
+- valign = Gtk.Align.END
+- };
+-
+- logged_in_context = logged_in.get_style_context ();
+-
+ if (lightdm_user.logged_in) {
++ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR);
++ logged_in.halign = logged_in.valign = Gtk.Align.END;
++
+ avatar_overlay.add_overlay (logged_in);
+
+ session_button.sensitive = false;
+@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
+ gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color);
+
+ var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null);
+- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+ password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+ }
+
+@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard {
+ return GLib.Source.REMOVE;
+ });
+ }
+-
+- private class SelectionCheck : Gtk.Spinner {
+- private static Gtk.CssProvider check_provider;
+-
+- class construct {
+- set_css_name (Gtk.STYLE_CLASS_CHECK);
+- }
+-
+- static construct {
+- check_provider = new Gtk.CssProvider ();
+- check_provider.load_from_resource ("/io/elementary/greeter/Check.css");
+- }
+-
+- construct {
+- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
+- }
+- }
+ }
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index e7a3d10b4fde..c5c8810c6c5e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -26,15 +26,26 @@ stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "6.1.0";
- repoName = "onboarding";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "onboarding";
rev = version;
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ appcenter = appcenter;
+ })
+ # Provides the directory where the locales are actually installed
+ # https://github.com/elementary/onboarding/pull/147
+ (fetchpatch {
+ url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
+ sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
+ })
+ ];
+
nativeBuildInputs = [
gettext
meson
@@ -56,19 +67,6 @@ stdenv.mkDerivation rec {
libhandy
];
- patches = [
- (substituteAll {
- src = ./fix-paths.patch;
- appcenter = appcenter;
- })
- # Provides the directory where the locales are actually installed
- # https://github.com/elementary/onboarding/pull/147
- (fetchpatch {
- url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
- sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
- })
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 119d5be21381..cc25419f2eb4 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -13,21 +13,13 @@ stdenv.mkDerivation rec {
pname = "elementary-print-shim";
version = "0.1.3";
- repoName = "print";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "print";
rev = version;
sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -37,6 +29,12 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Simple shim for printing support via Contractor";
homepage = "https://github.com/elementary/print";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 2c0d2ae100c7..bf466c4d59e1 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -80,7 +80,7 @@ let
Name=Pantheon
Comment=This session provides elementary experience
Exec=@out@/libexec/pantheon
- TryExec=${wingpanel}/bin/wingpanel
+ TryExec=${wingpanel}/bin/io.elementary.wingpanel
Icon=
DesktopNames=Pantheon
Type=Application
@@ -92,11 +92,9 @@ stdenv.mkDerivation rec {
pname = "elementary-session-settings";
version = "6.0.0";
- repoName = "session-settings";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "session-settings";
rev = version;
sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx";
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
index 7ffc2cebab79..eab86136c7d9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
@@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -60,6 +54,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Universal Access Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-a11y";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 56d59ed4614a..605b4b7709a5 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
@@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Bluetooth Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 4ce8fb0434f9..b36a95e8b201 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -29,11 +29,18 @@ stdenv.mkDerivation rec {
sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
+ })
+ # Upstream code not respecting our localedir
+ # https://github.com/elementary/wingpanel-indicator-keyboard/pull/110
+ (fetchpatch {
+ url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch";
+ sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0";
+ })
+ ];
nativeBuildInputs = [
meson
@@ -52,18 +59,11 @@ stdenv.mkDerivation rec {
xorg.xkeyboardconfig
];
- patches = [
- (substituteAll {
- src = ./fix-paths.patch;
- gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
- })
- # Upstream code not respecting our localedir
- # https://github.com/elementary/wingpanel-indicator-keyboard/pull/110
- (fetchpatch {
- url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch";
- sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0";
- })
- ];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
meta = with lib; {
description = "Keyboard Indicator for Wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index ecaa05bc356c..9261bccd5182 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
libxml2
meson
@@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
wingpanel
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Night Light Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-nightlight";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 38a8fb23701f..6c300536b2f8 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -30,11 +30,12 @@ stdenv.mkDerivation rec {
sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ gnome_power_manager = gnome.gnome-power-manager;
+ })
+ ];
nativeBuildInputs = [
meson
@@ -55,18 +56,17 @@ stdenv.mkDerivation rec {
wingpanel
];
- patches = [
- (substituteAll {
- src = ./fix-paths.patch;
- gnome_power_manager = gnome.gnome-power-manager;
- })
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Power Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-power";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 510558f3cb6a..41039ff686e9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -35,12 +35,6 @@ stdenv.mkDerivation rec {
})
];
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
wingpanel
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Session Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-session";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 0cd7a13c3e12..2e3f51b4a6a6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas=";
};
+ patches = [
+ ./indicators.patch
+ ];
+
nativeBuildInputs = [
gettext
meson
@@ -53,10 +57,6 @@ stdenv.mkDerivation rec {
mesa # for libEGL
];
- patches = [
- ./indicators.patch
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index a6c0cb8a3c53..ba00be72e279 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
dbus
meson
@@ -49,6 +43,12 @@ stdenv.mkDerivation rec {
PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "A desktop-wide extension service used by elementary OS";
homepage = "https://github.com/elementary/contractor";
diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index 2ea13c9cb595..5a78bb9c8a2b 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -19,11 +19,9 @@ stdenv.mkDerivation rec {
pname = "elementary-notifications";
version = "6.0.0";
- repoName = "notifications";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "notifications";
rev = version;
sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9";
};
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 69a0c2a7bb1a..ff0cc92da338 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -23,11 +23,9 @@ stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
version = "1.1.0";
- repoName = "settings-daemon";
-
src = fetchFromGitHub {
owner = "elementary";
- repo = repoName;
+ repo = "settings-daemon";
rev = version;
sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI=";
};
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index c135ea4e18ed..005ae0a461b3 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
sha256 = "0hx3sky0vd2vshkscy3w5x3s18gd45cfqh510xhbmvc0sa32q9gd";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
desktop-file-utils
meson
@@ -51,6 +45,12 @@ stdenv.mkDerivation rec {
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Pantheon Geoclue2 Agent";
homepage = "https://github.com/elementary/pantheon-agent-geoclue2";
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 3644d9665df0..b009954bc842 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "1acqjjarl225yk0f68wkldsamcrzrj0ibpcxma04wq9w7jlmz60c";
};
- passthru = {
- updateScript = nix-update-script {
- attrPath = "pantheon.${pname}";
- };
- };
-
nativeBuildInputs = [
meson
ninja
@@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
polkit
];
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with lib; {
description = "Polkit Agent for the Pantheon Desktop";
homepage = "https://github.com/elementary/pantheon-agent-polkit";
diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix
index 1751da3e8f30..52397f78b8a0 100644
--- a/pkgs/development/compilers/qbe/default.nix
+++ b/pkgs/development/compilers/qbe/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "qbe";
- version = "unstable-2021-11-22";
+ version = "unstable-2021-12-05";
src = fetchgit {
url = "git://c9x.me/qbe.git";
- rev = "bf153b359e9ce3ebef9bca899eb7ed5bd9045c11";
- sha256 = "sha256-13Mvq4VWZxlye/kncJibCnfSECx4PeHMYLuX0xMkN3A=";
+ rev = "367c8215d99054892740ad74c690b106c45ebf60";
+ sha256 = "sha256-xhTEiFR1RXMHtxmXlRof3O8monXEjstyWP3GClZmMuU=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix
index 383151a1cb5e..5820f98fa0f9 100644
--- a/pkgs/development/coq-modules/serapi/default.nix
+++ b/pkgs/development/coq-modules/serapi/default.nix
@@ -1,19 +1,6 @@
{ lib, fetchzip, mkCoqDerivation, coq, version ? null }:
let
- ocamlPackages =
- coq.ocamlPackages.overrideScope'
- (self: super: {
- ppxlib = super.ppxlib.override { version = "0.15.0"; };
- # the following does not work
- ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: {
- src = fetchzip {
- url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz";
- sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
- };
- });
- });
-
release = {
"8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
"8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja";
@@ -29,8 +16,6 @@ in
inherit version release;
defaultVersion = with versions;
- if isGe "4.12" coq.ocamlPackages.ocaml.version then null
- else
switch coq.version [
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
@@ -42,7 +27,7 @@ in
useDune2 = true;
propagatedBuildInputs =
- with ocamlPackages; [
+ with coq.ocamlPackages; [
cmdliner
findlib # run time dependency of SerAPI
ppx_deriving
diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix
index 9583be923939..adb7a9261739 100644
--- a/pkgs/development/interpreters/clojure/obb.nix
+++ b/pkgs/development/interpreters/clojure/obb.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "obb";
- version = "0.0.1";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "babashka";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc=";
+ sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix
index 79296a8e04f6..4af6d9b0ac42 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
+ ] ++ lib.optionals stdenv.hostPlatform.isRiscV [
+ "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables"
];
# aws-c-common misuses cmake modules, so we need
diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix
index 15bd5907af9e..b0a98f7b2638 100644
--- a/pkgs/development/libraries/imath/default.nix
+++ b/pkgs/development/libraries/imath/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "imath";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "imath";
rev = "v${version}";
- sha256 = "sha256-LoyV1Wtugva6MTpREstP2rYMrHW2xR0qfEAIV1Fo1Ns=";
+ sha256 = "sha256-FZXIIzAxhd0QlJAV0q7spEa1pNFXutI0WFZbT3izN4M=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index bff42af3acaa..5a88d4ba2056 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ izorkin ];
license = licenses.lgpl3;
platforms = platforms.unix;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin
};
}
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 081fa2f175bb..6ff8d54ca301 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -1,23 +1,35 @@
-{ stdenv, fetchurl, lib, darwin }:
+{ lib
+, stdenv
+, fetchurl
+, darwin
+, openssl
+}:
-# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
pname = "live555";
- version = "2019.11.22";
+ version = "2022.01.21";
- src = fetchurl { # the upstream doesn't provide a stable URL
+ src = fetchurl {
urls = [
- "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
+ "http://www.live555.com/liveMedia/public/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
+ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
];
- sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d";
+ sha256 = "sha256-diV5wULbOrqMRDCyI9NjVaR6JUbYl9KWHUlvA/jjqQ4=";
};
+ nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
+
+ buildInputs = [ openssl ];
+
postPatch = ''
- sed 's,/bin/rm,rm,g' -i genMakefiles
- sed \
+ substituteInPlace config.macosx-catalina \
+ --replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \
+ --replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib"
+ sed -i -e 's|/bin/rm|rm|g' genMakefiles
+ sed -i \
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
- -i config.linux
+ config.linux
'' + lib.optionalString (stdenv ? glibc) ''
substituteInPlace liveMedia/include/Locale.hh \
--replace '' ''
@@ -27,7 +39,7 @@ stdenv.mkDerivation rec {
runHook preConfigure
./genMakefiles ${{
- x86_64-darwin = "macosx";
+ x86_64-darwin = "macosx-catalina";
i686-linux = "linux";
x86_64-linux = "linux-64bit";
aarch64-linux = "linux-64bit";
@@ -48,15 +60,14 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
- nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
-
enableParallelBuilding = true;
meta = with lib; {
- description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
homepage = "http://www.live555.com/liveMedia/";
+ description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
};
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index acc3db0bdb19..cf97f904d9dc 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -1,5 +1,6 @@
[
"@angular/cli"
+, "@antfu/ni"
, "@antora/cli"
, "@antora/site-generator-default"
, "@astrojs/language-server"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 448945e43be9..47adf03bdb1b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1165,15 +1165,6 @@ let
sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==";
};
};
- "@babel/core-7.16.10" = {
- name = "_at_babel_slash_core";
- packageName = "@babel/core";
- version = "7.16.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.16.10.tgz";
- sha512 = "pbiIdZbCiMx/MM6toR+OfXarYix3uz0oVsnNtfdAGTcCTu3w/JGF8JhirevXLBJUu0WguSZI12qpKnx7EeMyLA==";
- };
- };
"@babel/core-7.16.12" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
@@ -1444,15 +1435,6 @@ let
sha512 = "V2dopEtPUL4LD+e8UtMIZB6BbsmMsS/7E1ZAvWNINzBfi7Cf3X9MLCpzHVZT4HeeF1lQl72IRtqqVt2RUImwyA==";
};
};
- "@babel/parser-7.16.10" = {
- name = "_at_babel_slash_parser";
- packageName = "@babel/parser";
- version = "7.16.10";
- src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.10.tgz";
- sha512 = "Sm/S9Or6nN8uiFsQU1yodyDW3MWXQhFeqzMPM+t8MJjM+pLsnFVxFZzkpXKvUXh+Gz9cbMoYYs484+Jw/NTEFQ==";
- };
- };
"@babel/parser-7.16.12" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
@@ -5935,13 +5917,13 @@ let
sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A==";
};
};
- "@octokit/request-5.6.2" = {
+ "@octokit/request-5.6.3" = {
name = "_at_octokit_slash_request";
packageName = "@octokit/request";
- version = "5.6.2";
+ version = "5.6.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz";
- sha512 = "je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==";
+ url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz";
+ sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==";
};
};
"@octokit/request-error-2.1.0" = {
@@ -6538,13 +6520,13 @@ let
sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
};
};
- "@putdotio/api-client-8.22.0" = {
+ "@putdotio/api-client-8.23.2" = {
name = "_at_putdotio_slash_api-client";
packageName = "@putdotio/api-client";
- version = "8.22.0";
+ version = "8.23.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.22.0.tgz";
- sha512 = "IL/ubwW6y4Y84JVbdPTxvdD0PHdVPBzXCjijmoCJFaazXYXP9iUGNeph0u5nuG+3El0CSuMQ6fz2Em0ktoXqrw==";
+ url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.23.2.tgz";
+ sha512 = "G5arIdtmFmg0J05dcoHxfNP4dEF/SU7SZmQEvbhXt1WCNkV+D/zSGM4C9YkPU2b9UWZxgYyYbz644dmW4KDG9A==";
};
};
"@reach/router-1.3.4" = {
@@ -7681,13 +7663,13 @@ let
sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==";
};
};
- "@types/eslint-8.4.0" = {
+ "@types/eslint-8.4.1" = {
name = "_at_types_slash_eslint";
packageName = "@types/eslint";
- version = "8.4.0";
+ version = "8.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.0.tgz";
- sha512 = "JUYa/5JwoqikCy7O7jKtuNe9Z4ZZt615G+1EKfaDGSNEpzaA2OwbV/G1v08Oa7fd1XzlFoSCvt9ePl9/6FyAug==";
+ url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz";
+ sha512 = "GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==";
};
};
"@types/eslint-scope-3.7.3" = {
@@ -8050,6 +8032,15 @@ let
sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==";
};
};
+ "@types/linkify-it-3.0.2" = {
+ name = "_at_types_slash_linkify-it";
+ packageName = "@types/linkify-it";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz";
+ sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==";
+ };
+ };
"@types/lodash-4.14.161" = {
name = "_at_types_slash_lodash";
packageName = "@types/lodash";
@@ -8086,6 +8077,15 @@ let
sha512 = "h0MqA7rtP88vuMepODf1oomJLeuRAZfOiYdeGS3NYO4TMQs237TkA+bNehy7V5nfyCjPRuKrb0fnWMjncHak0g==";
};
};
+ "@types/markdown-it-12.2.3" = {
+ name = "_at_types_slash_markdown-it";
+ packageName = "@types/markdown-it";
+ version = "12.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz";
+ sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==";
+ };
+ };
"@types/material-design-lite-1.1.16" = {
name = "_at_types_slash_material-design-lite";
packageName = "@types/material-design-lite";
@@ -8104,6 +8104,15 @@ let
sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==";
};
};
+ "@types/mdurl-1.0.2" = {
+ name = "_at_types_slash_mdurl";
+ packageName = "@types/mdurl";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz";
+ sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==";
+ };
+ };
"@types/mime-1.3.2" = {
name = "_at_types_slash_mime";
packageName = "@types/mime";
@@ -9211,31 +9220,31 @@ let
sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g==";
};
};
- "@vue/compiler-core-3.2.28" = {
+ "@vue/compiler-core-3.2.29" = {
name = "_at_vue_slash_compiler-core";
packageName = "@vue/compiler-core";
- version = "3.2.28";
+ version = "3.2.29";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.28.tgz";
- sha512 = "mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA==";
+ url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.29.tgz";
+ sha512 = "RePZ/J4Ub3sb7atQw6V6Rez+/5LCRHGFlSetT3N4VMrejqJnNPXKUt5AVm/9F5MJriy2w/VudEIvgscCfCWqxw==";
};
};
- "@vue/compiler-dom-3.2.28" = {
+ "@vue/compiler-dom-3.2.29" = {
name = "_at_vue_slash_compiler-dom";
packageName = "@vue/compiler-dom";
- version = "3.2.28";
+ version = "3.2.29";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz";
- sha512 = "KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q==";
+ url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.29.tgz";
+ sha512 = "y26vK5khdNS9L3ckvkqJk/78qXwWb75Ci8iYLb67AkJuIgyKhIOcR1E8RIt4mswlVCIeI9gQ+fmtdhaiTAtrBQ==";
};
};
- "@vue/shared-3.2.28" = {
+ "@vue/shared-3.2.29" = {
name = "_at_vue_slash_shared";
packageName = "@vue/shared";
- version = "3.2.28";
+ version = "3.2.29";
src = fetchurl {
- url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.28.tgz";
- sha512 = "eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A==";
+ url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.29.tgz";
+ sha512 = "BjNpU8OK6Z0LVzGUppEk0CMYm/hKDnZfYdjSmPOs0N+TR1cLKJAkDwW8ASZUvaaSLEi6d3hVM7jnWnX+6yWnHw==";
};
};
"@webassemblyjs/ast-1.11.1" = {
@@ -16709,22 +16718,22 @@ let
sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
};
};
- "cdk8s-1.4.9" = {
+ "cdk8s-1.4.10" = {
name = "cdk8s";
packageName = "cdk8s";
- version = "1.4.9";
+ version = "1.4.10";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.9.tgz";
- sha512 = "J1XGPzgdTDYozqAJ4TQUyrXUY9BYpdQkCDNBFVVU1RatlARhh2Uj7217XnRuNI6CDyuhTGaDFFuSf3HPAHbYxg==";
+ url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.10.tgz";
+ sha512 = "k0dLzCGg0i7MJFG6wr9mvaq3aaGS2nbwkOtwojiHiGj3wMNLPgZwrZ37s6ZRhquWdZqkOnAfgU7QgxRNmE6wgw==";
};
};
- "cdk8s-plus-22-1.0.0-beta.95" = {
+ "cdk8s-plus-22-1.0.0-beta.96" = {
name = "cdk8s-plus-22";
packageName = "cdk8s-plus-22";
- version = "1.0.0-beta.95";
+ version = "1.0.0-beta.96";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.95.tgz";
- sha512 = "cJscI0F6VhDoMjXu9exsnPBVgo+kyODgNYfLFVArNcKImT9/fJum96MXpZJ3ZqBZnadlarCpSjmsDDLbrAHEIw==";
+ url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.96.tgz";
+ sha512 = "BM1ZtZrbITxki/AXXGAVXHbrxRsREnU/VddrtjOEaS04LLvjpoNuEXX8dANyBwTMdMU1gCP0ghwHCxTHaTTfwQ==";
};
};
"cdktf-0.8.6" = {
@@ -19391,22 +19400,22 @@ let
sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
};
};
- "constructs-10.0.41" = {
+ "constructs-10.0.42" = {
name = "constructs";
packageName = "constructs";
- version = "10.0.41";
+ version = "10.0.42";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-10.0.41.tgz";
- sha512 = "h8HytpdxtuO9PPndcvZGX90Silp9lCWxf0XlzGhWOGpZchIyDFR+pqy4n0eiyEsPcclPF0CMfCA3UcGugu3+vw==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-10.0.42.tgz";
+ sha512 = "NC/OGRj9a+TCBAuJP6jV99CFMtKEhyRmfMmyKX2WDdbedmmjKk0C2TXgaqGUqsj9PbS0guGP8B4cMIRzmf/7Xg==";
};
};
- "constructs-3.3.196" = {
+ "constructs-3.3.197" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.196";
+ version = "3.3.197";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.196.tgz";
- sha512 = "0Sz3L28vykhG57fc2DljNBph2MBkedSZZcYIArv+wDYKm3vvio2PNMbK66FB9Vl+dKicE/RV9LDMD/Cd3MSelg==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.197.tgz";
+ sha512 = "s+sDpPt7JYyUixb6f89UIGfUp8cfSj9mJTvsbE1Kjc/ALZxpgg0yYwlV1UBoVVoKH0kzpX8S5EdbWkw1uLY7yw==";
};
};
"consume-http-header-1.0.0" = {
@@ -23766,31 +23775,31 @@ let
sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==";
};
};
- "dockerfile-ast-0.4.1" = {
+ "dockerfile-ast-0.4.2" = {
name = "dockerfile-ast";
packageName = "dockerfile-ast";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.1.tgz";
- sha512 = "qM5/m+Ez4GOM3ILkG13+cPxwgIcuA/z3LmEPZf4VJ82f7T1DuVbz7ctw4IzWdbiecuXcs+C4fFVbo5priGnIIQ==";
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz";
+ sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA==";
};
};
- "dockerfile-language-service-0.7.4" = {
+ "dockerfile-language-service-0.8.1" = {
name = "dockerfile-language-service";
packageName = "dockerfile-language-service";
- version = "0.7.4";
+ version = "0.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.4.tgz";
- sha512 = "SxKqTMQshN6xr20qTeurUydI432+ZUrkfhMurknjPvhdTc5oheH+WeN1cqKKQrILlcVq7agbFlXH51sdempuGQ==";
+ url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.8.1.tgz";
+ sha512 = "bqrZ2FzG45w2Mzmak3oC5ecIl/edStygSFQ0i/8WGabb5k/w6zWwqDaHVgT8dkfogm+swHMQUu4WGTvVu1qLCA==";
};
};
- "dockerfile-utils-0.9.3" = {
+ "dockerfile-utils-0.9.4" = {
name = "dockerfile-utils";
packageName = "dockerfile-utils";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.3.tgz";
- sha512 = "tMPdbywzglQh7JieKL1vn7HyJoYwk8J8AyfyLaqkLJ5tRA/TSrOVK6R40C3bwEceYg875crMo8yHSkz09Fc6VA==";
+ url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.4.tgz";
+ sha512 = "lqmCxVhaUyCUIz9dhzYVrHZLJG5hzdcwd29JcA/0o7xIx2VwvIctUE6SpK8ugLTNuwMx/oKU2YVLaRIX/CmQPg==";
};
};
"doctoc-2.1.0" = {
@@ -32544,13 +32553,13 @@ let
sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==";
};
};
- "http-proxy-middleware-2.0.1" = {
+ "http-proxy-middleware-2.0.2" = {
name = "http-proxy-middleware";
packageName = "http-proxy-middleware";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz";
- sha512 = "cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==";
+ url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.2.tgz";
+ sha512 = "XtmDN5w+vdFTBZaYhdJAbMqn0DP/EhkUaAeo963mojwpKMMbw6nivtFKw07D7DDOH745L5k0VL0P8KRYNEVF/g==";
};
};
"http-signature-0.11.0" = {
@@ -36604,13 +36613,13 @@ let
sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g==";
};
};
- "jsdoc-3.6.7" = {
+ "jsdoc-3.6.9" = {
name = "jsdoc";
packageName = "jsdoc";
- version = "3.6.7";
+ version = "3.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz";
- sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==";
+ url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz";
+ sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw==";
};
};
"jsdom-11.12.0" = {
@@ -36730,13 +36739,13 @@ let
sha512 = "iFpupZWQusVYGHaUPooaO6xVAtRp+o1EOMBS2FcJBZcWGbB8fRG3zzpeMSkoqu/Pjqtu7boh45V90CXtSmVfMQ==";
};
};
- "jsii-srcmak-0.1.453" = {
+ "jsii-srcmak-0.1.454" = {
name = "jsii-srcmak";
packageName = "jsii-srcmak";
- version = "0.1.453";
+ version = "0.1.454";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.453.tgz";
- sha512 = "cMH4f2r1c2ykXdlvvsbPy0DUGFCiphqJ6pdTMKT+R07nY+epHQ9aF/8BV38hGzxiqMVX+7f/FHJ6VYQYEnEXBw==";
+ url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.454.tgz";
+ sha512 = "TN0J2q2QQ92bzJuxKheb0NNSChy2AqDK9TBznBsbzYqPv5QwNZIMsnPrD1HVJRPVvS5Vz8+VttNjVniLw4QArg==";
};
};
"json-bigint-1.0.0" = {
@@ -37027,13 +37036,13 @@ let
sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
};
};
- "json2jsii-0.2.113" = {
+ "json2jsii-0.2.114" = {
name = "json2jsii";
packageName = "json2jsii";
- version = "0.2.113";
+ version = "0.2.114";
src = fetchurl {
- url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.113.tgz";
- sha512 = "H3SjBlxMhJ0k+zjEuxCMZwpwGfl8ECNoy2CPgiX33kSJsyNwJFM6Qo15DhS/mucgBh8p2wtfg93wdlYTfzNxMQ==";
+ url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.114.tgz";
+ sha512 = "g1xBiPKcsTydLpeNXqe+HXD8gM/Wod5zrTwJqPpjFP+QNaDOjjMLPjmGa5R4gHwyapOT7GbqLH9bZhY+jnl1lw==";
};
};
"json3-3.2.6" = {
@@ -37774,13 +37783,13 @@ let
sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
};
};
- "klaw-3.0.0" = {
+ "klaw-4.0.1" = {
name = "klaw";
packageName = "klaw";
- version = "3.0.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz";
- sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
+ url = "https://registry.npmjs.org/klaw/-/klaw-4.0.1.tgz";
+ sha512 = "pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw==";
};
};
"klaw-sync-6.0.0" = {
@@ -38818,13 +38827,13 @@ let
sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg==";
};
};
- "ln-telegram-3.8.0" = {
+ "ln-telegram-3.9.0" = {
name = "ln-telegram";
packageName = "ln-telegram";
- version = "3.8.0";
+ version = "3.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.8.0.tgz";
- sha512 = "4T2YaRNvQtWLqjRENFSRO+B3qJE93X9nSX1TqFwWhdtp7Z3UHpd/YjxeAjPsH1lLTl2hY9FIDK3RiayJky6TVA==";
+ url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.9.0.tgz";
+ sha512 = "Desl/QCdnXwMh98n0p7KVY17X9W6hDDh+HrU+UaaNbAkjw8GN+VZRYSMTqLIPXCf5QhWDlpSA7EruTHzKOAwMw==";
};
};
"load-bmfont-1.4.1" = {
@@ -40357,13 +40366,13 @@ let
sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==";
};
};
- "log4js-6.4.0" = {
+ "log4js-6.4.1" = {
name = "log4js";
packageName = "log4js";
- version = "6.4.0";
+ version = "6.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/log4js/-/log4js-6.4.0.tgz";
- sha512 = "ysc/XUecZJuN8NoKOssk3V0cQ29xY4fra6fnigZa5VwxFsCsvdqsdnEuAxNN89LlHpbE4KUD3zGcn+kFqonSVQ==";
+ url = "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz";
+ sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==";
};
};
"logform-2.3.2" = {
@@ -41186,6 +41195,15 @@ let
sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==";
};
};
+ "markdown-it-anchor-8.4.1" = {
+ name = "markdown-it-anchor";
+ packageName = "markdown-it-anchor";
+ version = "8.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.4.1.tgz";
+ sha512 = "sLODeRetZ/61KkKLJElaU3NuU2z7MhXf12Ml1WJMSdwpngeofneCRF+JBbat8HiSqhniOMuTemXMrsI7hA6XyA==";
+ };
+ };
"markdown-it-deflist-2.1.0" = {
name = "markdown-it-deflist";
packageName = "markdown-it-deflist";
@@ -44786,6 +44804,15 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
+ "negotiator-0.6.3" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.6.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
+ sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
+ };
+ };
"negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
name = "negotiator";
packageName = "negotiator";
@@ -48352,15 +48379,6 @@ let
sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
};
};
- "paid-services-3.10.0" = {
- name = "paid-services";
- packageName = "paid-services";
- version = "3.10.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/paid-services/-/paid-services-3.10.0.tgz";
- sha512 = "Uxq9yk+SFG9bVDDgVce5kQ0OXuTZ/jqk4V27rqPX6EnEMIQOHmf/zNRpsGBowUDUBOdstGYdyZQ4avp7w2Q92w==";
- };
- };
"paid-services-3.11.0" = {
name = "paid-services";
packageName = "paid-services";
@@ -50134,13 +50152,13 @@ let
sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==";
};
};
- "polished-4.1.3" = {
+ "polished-4.1.4" = {
name = "polished";
packageName = "polished";
- version = "4.1.3";
+ version = "4.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz";
- sha512 = "ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA==";
+ url = "https://registry.npmjs.org/polished/-/polished-4.1.4.tgz";
+ sha512 = "Nq5Mbza+Auo7N3sQb1QMFaQiDO+4UexWuSGR7Cjb4Sw11SZIJcrrFtiZ+L0jT9MBsUsxDboHVASbCLbE1rnECg==";
};
};
"polyraf-1.1.0" = {
@@ -53123,13 +53141,13 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
- "pyright-1.1.212" = {
+ "pyright-1.1.214" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.212";
+ version = "1.1.214";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz";
- sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz";
+ sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g==";
};
};
"q-0.9.7" = {
@@ -56246,13 +56264,13 @@ let
sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==";
};
};
- "resolve-1.21.1" = {
+ "resolve-1.22.0" = {
name = "resolve";
packageName = "resolve";
- version = "1.21.1";
+ version = "1.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/resolve/-/resolve-1.21.1.tgz";
- sha512 = "lfEImVbnolPuaSZuLQ52cAxPBHeI77sPwCOWRdy12UG/CNa8an7oBHH1R+Fp1/mUqSJi4c8TIP6FOIPSZAUrEQ==";
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz";
+ sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==";
};
};
"resolve-1.7.1" = {
@@ -60665,13 +60683,13 @@ let
sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
};
};
- "sscaff-1.2.179" = {
+ "sscaff-1.2.180" = {
name = "sscaff";
packageName = "sscaff";
- version = "1.2.179";
+ version = "1.2.180";
src = fetchurl {
- url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.179.tgz";
- sha512 = "mIAzYsIKkePDogi5yLv8fM0S8t5P3U+QEG9eZannpycDB8k0SAr0fxEhXuyskR96m1zqrqcgjEYYEzTTTwBKqQ==";
+ url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.180.tgz";
+ sha512 = "Cvyq1YACYkREBswBXckOPX31ega2XnRsDUqhKCWZwC+bI8UXBR2ijGnI+jW3x2tlFw7N+HyO3ZR2WfXqWjjS+Q==";
};
};
"ssh-config-1.1.6" = {
@@ -72180,7 +72198,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."node-gyp-8.4.1"
sources."nopt-5.0.0"
sources."npm-bundled-1.1.2"
@@ -72255,6 +72273,24 @@ in
bypassCache = true;
reconstructLock = true;
};
+ "@antfu/ni" = nodeEnv.buildNodePackage {
+ name = "_at_antfu_slash_ni";
+ packageName = "@antfu/ni";
+ version = "0.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.12.0.tgz";
+ sha512 = "f+uqWBuXoShLpLSaQKHeFUnoUdvMGx8xcXrtyfxK95RGx5guKJVo3kVb2JtLNWkzwYzQvtQ+q0hU9YwSDSTVSw==";
+ };
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Use the right package manager";
+ homepage = "https://github.com/antfu/ni#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
"@antora/cli" = nodeEnv.buildNodePackage {
name = "_at_antora_slash_cli";
packageName = "@antora/cli";
@@ -72982,7 +73018,7 @@ in
sources."readable-stream-3.6.0"
sources."redent-3.0.0"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-5.0.0"
sources."resolve-global-1.0.0"
sources."safe-buffer-5.2.1"
@@ -73328,7 +73364,7 @@ in
sources."record-cache-1.1.1"
sources."refpool-1.2.2"
sources."remove-trailing-separator-1.1.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."safe-buffer-5.1.2"
sources."secretstream-stream-2.0.0"
sources."sha256-universal-1.2.1"
@@ -73440,7 +73476,7 @@ in
sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ==";
};
dependencies = [
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@medable/mdctl-api-1.0.62"
sources."@medable/mdctl-core-1.0.62"
sources."@medable/mdctl-core-schemas-1.0.62"
@@ -73469,6 +73505,9 @@ in
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."@types/glob-7.2.0"
+ sources."@types/linkify-it-3.0.2"
+ sources."@types/markdown-it-12.2.3"
+ sources."@types/mdurl-1.0.2"
sources."@types/minimatch-3.0.5"
sources."@types/node-17.0.10"
sources."@types/tough-cookie-2.3.8"
@@ -73489,7 +73528,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."argparse-1.0.10"
+ sources."argparse-2.0.1"
sources."argsarray-0.0.1"
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
@@ -73616,7 +73655,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ecdsa-sig-formatter-1.0.11"
sources."end-of-stream-1.4.4"
- sources."entities-2.0.3"
+ sources."entities-2.1.0"
sources."es3ify-0.2.2"
sources."escape-string-regexp-2.0.0"
(sources."escodegen-1.14.3" // {
@@ -73821,12 +73860,13 @@ in
sources."isstream-0.1.2"
(sources."js-yaml-3.14.1" // {
dependencies = [
+ sources."argparse-1.0.10"
sources."esprima-4.0.1"
];
})
sources."js2xmlparser-4.0.2"
sources."jsbn-0.1.1"
- (sources."jsdoc-3.6.7" // {
+ (sources."jsdoc-3.6.9" // {
dependencies = [
sources."mkdirp-1.0.4"
sources."strip-json-comments-3.1.1"
@@ -73852,11 +73892,11 @@ in
sources."jws-3.2.2"
sources."keytar-4.13.0"
sources."kind-of-6.0.3"
- sources."klaw-3.0.0"
+ sources."klaw-4.0.1"
sources."lcid-2.0.0"
sources."levn-0.3.0"
sources."lie-3.0.4"
- sources."linkify-it-2.2.0"
+ sources."linkify-it-3.0.3"
sources."locate-path-3.0.0"
sources."lodash-4.17.21"
sources."lodash.includes-4.3.0"
@@ -73870,9 +73910,9 @@ in
sources."map-age-cleaner-0.1.3"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
- sources."markdown-it-10.0.0"
- sources."markdown-it-anchor-5.3.0"
- sources."marked-2.1.3"
+ sources."markdown-it-12.3.2"
+ sources."markdown-it-anchor-8.4.1"
+ sources."marked-4.0.10"
sources."md5.js-1.3.5"
sources."mdurl-1.0.1"
(sources."mem-4.3.0" // {
@@ -74115,7 +74155,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."requizzle-0.2.3"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-url-0.2.1"
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
@@ -74367,7 +74407,7 @@ in
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/request-5.6.2"
+ sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
sources."@octokit/types-6.34.0"
@@ -74492,7 +74532,7 @@ in
sources."ajv-8.6.3"
];
})
- sources."@types/eslint-8.4.0"
+ sources."@types/eslint-8.4.1"
sources."@types/eslint-scope-3.7.3"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.9"
@@ -74684,7 +74724,7 @@ in
sources."readdirp-3.6.0"
sources."rechoir-0.6.2"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-4.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-3.0.2"
@@ -74871,7 +74911,7 @@ in
sources."@apollographql/graphql-upload-8-fork-8.1.3"
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- sources."@babel/core-7.16.10"
+ sources."@babel/core-7.16.12"
sources."@babel/generator-7.16.8"
sources."@babel/helper-annotate-as-pure-7.16.7"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7"
@@ -74899,7 +74939,7 @@ in
sources."@babel/helper-wrap-function-7.16.8"
sources."@babel/helpers-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -75049,13 +75089,13 @@ in
})
sources."@vue/cli-ui-addon-webpack-4.5.15"
sources."@vue/cli-ui-addon-widgets-4.5.15"
- (sources."@vue/compiler-core-3.2.28" // {
+ (sources."@vue/compiler-core-3.2.29" // {
dependencies = [
sources."source-map-0.6.1"
];
})
- sources."@vue/compiler-dom-3.2.28"
- sources."@vue/shared-3.2.28"
+ sources."@vue/compiler-dom-3.2.29"
+ sources."@vue/shared-3.2.29"
sources."@wry/equality-0.1.11"
sources."accepts-1.3.7"
sources."aggregate-error-3.1.0"
@@ -75767,7 +75807,7 @@ in
sources."repeat-string-1.6.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-url-0.2.1"
sources."responselike-1.0.2"
sources."restore-cursor-2.0.0"
@@ -76183,7 +76223,7 @@ in
sources."@babel/generator-7.16.8"
sources."@babel/helper-validator-identifier-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/template-7.16.7"
sources."@babel/types-7.16.8"
sources."@webassemblyjs/ast-1.11.1"
@@ -76745,7 +76785,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- (sources."@babel/core-7.16.10" // {
+ (sources."@babel/core-7.16.12" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -76768,7 +76808,7 @@ in
sources."@babel/helper-validator-option-7.16.7"
sources."@babel/helpers-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/template-7.16.7"
sources."@babel/traverse-7.16.10"
sources."@babel/types-7.16.8"
@@ -76848,7 +76888,7 @@ in
sources."path-parse-1.0.7"
sources."picocolors-1.0.0"
sources."pkginfo-0.4.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."safe-buffer-5.1.2"
sources."sax-0.5.8"
sources."semver-6.3.0"
@@ -77696,7 +77736,7 @@ in
sources."remark-parse-9.0.0"
sources."remark-stringify-9.0.1"
sources."repeat-string-1.6.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."reusify-1.0.4"
@@ -77815,10 +77855,10 @@ in
balanceofsatoshis = nodeEnv.buildNodePackage {
name = "balanceofsatoshis";
packageName = "balanceofsatoshis";
- version = "11.32.0";
+ version = "11.33.0";
src = fetchurl {
- url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.32.0.tgz";
- sha512 = "W6s76ux/BsMQ619z5z/CnR/bGMb9Jx6rYH/tFURH4Eth9oBcwJW8xIarJB8R+Z8U4zTWN00wUVjs/JAuFGVLNw==";
+ url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.33.0.tgz";
+ sha512 = "B0jG/bSjDBihGEpB4slDg/oxjOBbtmP91fOHTItfUuUTfNvGuWXMP707TlmqKlcCOq0rdzJWQD+3j+e2xD72HQ==";
};
dependencies = [
(sources."@alexbosworth/caporal-1.4.0" // {
@@ -78243,27 +78283,7 @@ in
sources."ws-8.4.2"
];
})
- (sources."ln-telegram-3.8.0" // {
- dependencies = [
- sources."@grpc/grpc-js-1.5.1"
- sources."@grpc/proto-loader-0.6.9"
- sources."@types/node-17.0.8"
- sources."@types/request-2.48.8"
- sources."bolt09-0.2.1"
- sources."content-disposition-0.5.4"
- sources."cookie-0.4.1"
- sources."express-4.17.2"
- sources."lightning-5.3.3"
- sources."ln-service-53.5.0"
- sources."ms-2.1.3"
- sources."paid-services-3.10.0"
- sources."safe-buffer-5.2.1"
- sources."send-0.17.2"
- sources."serve-static-1.14.2"
- sources."type-fest-2.9.0"
- sources."ws-8.4.2"
- ];
- })
+ sources."ln-telegram-3.9.0"
sources."lodash-4.17.21"
sources."lodash.camelcase-4.3.0"
sources."lodash.difference-4.5.0"
@@ -78958,7 +78978,7 @@ in
sources."read-pkg-up-1.0.1"
sources."redent-1.0.0"
sources."repeating-2.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
(sources."rimraf-2.7.1" // {
dependencies = [
sources."glob-7.2.0"
@@ -79173,7 +79193,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."ripemd160-2.0.2"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
@@ -79493,7 +79513,7 @@ in
sources."@babel/code-frame-7.16.7"
sources."@babel/helper-validator-identifier-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/types-7.16.8"
sources."@kwsites/file-exists-1.1.1"
sources."@kwsites/promise-deferred-1.1.1"
@@ -79833,7 +79853,7 @@ in
})
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-2.4.5"
sources."ripemd160-2.0.2"
sources."rndm-1.2.0"
@@ -80241,7 +80261,7 @@ in
sources."redent-1.0.0"
sources."repeating-2.0.1"
sources."request-2.88.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-2.7.1"
sources."router-0.6.2"
sources."run-parallel-1.2.0"
@@ -80783,7 +80803,7 @@ in
sources."registry-url-3.1.0"
sources."repeat-element-1.1.4"
sources."repeat-string-1.6.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-url-0.2.1"
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
@@ -80960,10 +80980,10 @@ in
cdk8s-cli = nodeEnv.buildNodePackage {
name = "cdk8s-cli";
packageName = "cdk8s-cli";
- version = "1.0.81";
+ version = "1.0.82";
src = fetchurl {
- url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.81.tgz";
- sha512 = "w72Dih5ouCqHXDidmE4Ulu+rd+pJ2wlxJfSUiBajYkpIqLMIBxLj6/Fn8UVjnydDx8uhti2VjzaVURHsPqlDVw==";
+ url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.82.tgz";
+ sha512 = "lzvZVO555YM7Z39hA6Tyg28RMedCues7Wh3hv1RaAGZ7lyAkTT12kUELOg6jM+VQ0NZD+90sAcBk8NXNghuZkA==";
};
dependencies = [
sources."@jsii/check-node-1.52.1"
@@ -80978,8 +80998,8 @@ in
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
sources."case-1.6.3"
- sources."cdk8s-1.4.9"
- sources."cdk8s-plus-22-1.0.0-beta.95"
+ sources."cdk8s-1.4.10"
+ sources."cdk8s-plus-22-1.0.0-beta.96"
sources."chalk-4.1.2"
sources."cliui-7.0.4"
sources."clone-2.1.2"
@@ -80992,7 +81012,7 @@ in
sources."color-name-1.1.4"
sources."colors-1.4.0"
sources."commonmark-0.30.0"
- sources."constructs-3.3.196"
+ sources."constructs-3.3.197"
sources."date-format-4.0.3"
sources."debug-4.3.3"
sources."decamelize-5.0.1"
@@ -81072,18 +81092,18 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-srcmak-0.1.453" // {
+ (sources."jsii-srcmak-0.1.454" // {
dependencies = [
sources."fs-extra-9.1.0"
];
})
sources."json-schema-0.4.0"
sources."json-schema-traverse-1.0.0"
- sources."json2jsii-0.2.113"
+ sources."json2jsii-0.2.114"
sources."jsonfile-6.1.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
- sources."log4js-6.4.0"
+ sources."log4js-6.4.1"
sources."lower-case-2.0.2"
sources."lru-cache-6.0.0"
sources."mdurl-1.0.1"
@@ -81117,7 +81137,7 @@ in
sources."snake-case-3.0.4"
sources."sort-json-2.0.0"
sources."spdx-license-list-6.4.0"
- sources."sscaff-1.2.179"
+ sources."sscaff-1.2.180"
(sources."streamroller-3.0.2" // {
dependencies = [
sources."fs-extra-10.0.0"
@@ -81178,7 +81198,7 @@ in
sources."@babel/generator-7.16.8"
sources."@babel/helper-validator-identifier-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/template-7.16.7"
sources."@babel/types-7.16.8"
sources."@cdktf/hcl2cdk-0.8.6"
@@ -81223,7 +81243,7 @@ in
sources."combined-stream-1.0.8"
sources."commonmark-0.30.0"
sources."concat-map-0.0.1"
- sources."constructs-10.0.41"
+ sources."constructs-10.0.42"
sources."date-format-4.0.3"
sources."debug-4.3.3"
sources."decamelize-1.2.0"
@@ -81347,7 +81367,7 @@ in
sources."yargs-parser-20.2.9"
];
})
- (sources."jsii-srcmak-0.1.453" // {
+ (sources."jsii-srcmak-0.1.454" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -81358,7 +81378,7 @@ in
sources."jsonfile-4.0.0"
sources."jsonschema-1.4.0"
sources."locate-path-5.0.0"
- sources."log4js-6.4.0"
+ sources."log4js-6.4.1"
sources."lru-cache-6.0.0"
sources."mdurl-1.0.1"
sources."mime-db-1.51.0"
@@ -81797,10 +81817,10 @@ in
coc-explorer = nodeEnv.buildNodePackage {
name = "coc-explorer";
packageName = "coc-explorer";
- version = "0.21.0";
+ version = "0.21.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.0.tgz";
- sha512 = "EPAJw1fedBDBjaGXBOxqidUgsNE1Yget6Z96SmFHZswpujcM5WQa95hg2nHJhZqfYAtmEp9TTT0ewmeS8Z83BA==";
+ url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.1.tgz";
+ sha512 = "+J77if2qoBt1KWC2nu5/1KnRpydEnZX28rL0MQC1RFicxiwQ77WKrtcTkm/qgvWGWt/OuX+T5734Crbh0pRGog==";
};
dependencies = [
sources."@sindresorhus/df-3.1.1"
@@ -82173,7 +82193,7 @@ in
];
})
sources."lodash-4.17.21"
- sources."log4js-6.4.0"
+ sources."log4js-6.4.1"
sources."lru-cache-6.0.0"
sources."metals-languageclient-0.4.2"
sources."minimatch-3.0.4"
@@ -82997,7 +83017,7 @@ in
sources."require-from-string-2.0.2"
sources."require-main-filename-1.0.1"
sources."require-relative-0.8.7"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
(sources."resolve-cwd-2.0.0" // {
dependencies = [
sources."resolve-from-3.0.0"
@@ -83277,7 +83297,7 @@ in
sha512 = "d+x38jGi3b0gD4axhYdHcS6TX9T/Q6qndVbn3TQMbLdQxiGmBBoy/hB/AouXwEByg/XyBtmyDiaWxm7r0UfgQw==";
};
dependencies = [
- sources."pyright-1.1.212"
+ sources."pyright-1.1.214"
];
buildInputs = globalBuildInputs;
meta = {
@@ -83429,7 +83449,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- sources."@babel/core-7.16.10"
+ sources."@babel/core-7.16.12"
sources."@babel/generator-7.16.8"
sources."@babel/helper-compilation-targets-7.16.7"
sources."@babel/helper-environment-visitor-7.16.7"
@@ -83448,7 +83468,7 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/template-7.16.7"
sources."@babel/traverse-7.16.10"
sources."@babel/types-7.16.8"
@@ -83680,7 +83700,7 @@ in
sources."remark-stringify-9.0.1"
sources."repeat-string-1.6.1"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-5.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
@@ -83836,7 +83856,7 @@ in
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.7"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."semver-5.7.1"
sources."sprintf-js-1.0.3"
sources."supports-color-5.5.0"
@@ -84073,7 +84093,7 @@ in
sources."punycode-2.1.1"
sources."regexpp-3.2.0"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
sources."semver-7.3.5"
@@ -84752,7 +84772,7 @@ in
sources."readable-stream-3.6.0"
sources."redent-3.0.0"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."safe-buffer-5.2.1"
sources."semver-6.3.0"
sources."source-map-0.6.1"
@@ -84823,7 +84843,11 @@ in
sources."@szmarczak/http-timer-1.1.2"
sources."@tootallnate/once-1.1.2"
sources."abbrev-1.1.1"
- sources."accepts-1.3.7"
+ (sources."accepts-1.3.7" // {
+ dependencies = [
+ sources."negotiator-0.6.2"
+ ];
+ })
sources."agent-base-6.0.2"
sources."agentkeepalive-4.2.0"
sources."aggregate-error-3.1.0"
@@ -85182,7 +85206,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."node-gyp-7.1.2"
sources."nopt-5.0.0"
sources."normalize-package-data-3.0.3"
@@ -85267,7 +85291,7 @@ in
sources."registry-url-5.1.0"
sources."request-2.88.2"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-4.0.0"
sources."responselike-1.0.2"
(sources."restore-cursor-2.0.0" // {
@@ -85674,7 +85698,7 @@ in
sources."regex-not-1.0.2"
sources."repeat-element-1.1.4"
sources."repeat-string-1.6.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
sources."safe-regex-1.1.0"
@@ -86898,7 +86922,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- (sources."@babel/core-7.16.10" // {
+ (sources."@babel/core-7.16.12" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -86934,7 +86958,7 @@ in
sources."@babel/helper-wrap-function-7.16.8"
sources."@babel/helpers-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7"
sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7"
sources."@babel/plugin-proposal-async-generator-functions-7.16.8"
@@ -87431,7 +87455,7 @@ in
sources."repeat-string-1.6.1"
sources."requires-port-1.0.0"
sources."resize-observer-polyfill-1.5.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-protobuf-schema-2.1.0"
sources."resolve-url-0.2.1"
sources."responselike-1.0.2"
@@ -87706,15 +87730,15 @@ in
dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
name = "dockerfile-language-server-nodejs";
packageName = "dockerfile-language-server-nodejs";
- version = "0.7.3";
+ version = "0.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.3.tgz";
- sha512 = "+fY8JCuoL3T698EZKd78SF1RrGBGYZVRzRDLrWHaum3qx5gW8uMDX41rtaehX7/ZNH/WSuwyFtWh3/JWmjEAKw==";
+ url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.8.0.tgz";
+ sha512 = "7oxOu3PWDzsTkLbUIm1O61rgdNiM9j9tAt+T0R5m0TFG0NYypYBM77pfzAYmQFpHGHAstCtOaEYzEnp0IkRCnQ==";
};
dependencies = [
- sources."dockerfile-ast-0.4.1"
- sources."dockerfile-language-service-0.7.4"
- sources."dockerfile-utils-0.9.3"
+ sources."dockerfile-ast-0.4.2"
+ sources."dockerfile-language-service-0.8.1"
+ sources."dockerfile-utils-0.9.4"
sources."vscode-jsonrpc-8.0.0-next.5"
sources."vscode-languageserver-8.0.0-next.6"
(sources."vscode-languageserver-protocol-3.17.0-next.12" // {
@@ -88263,7 +88287,7 @@ in
sources."mkdirp-1.0.4"
sources."ms-2.0.0"
sources."mute-stream-0.0.8"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."nice-try-1.0.5"
sources."node-abi-3.5.0"
sources."node-addon-api-3.2.1"
@@ -88367,7 +88391,7 @@ in
sources."repeating-2.0.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-alpn-1.2.1"
sources."resolve-dir-1.0.1"
sources."resolve-package-1.0.1"
@@ -88525,7 +88549,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- (sources."@babel/core-7.16.10" // {
+ (sources."@babel/core-7.16.12" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -88550,7 +88574,7 @@ in
sources."@babel/helper-validator-option-7.16.7"
sources."@babel/helpers-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/plugin-proposal-object-rest-spread-7.16.7"
sources."@babel/plugin-syntax-jsx-7.16.7"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -88757,7 +88781,7 @@ in
];
})
sources."redent-3.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-3.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-3.0.2"
@@ -90111,7 +90135,7 @@ in
})
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-dir-1.0.1"
sources."resolve-options-1.1.0"
sources."resolve-url-0.2.1"
@@ -90870,7 +90894,7 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/runtime-7.9.0"
(sources."@babel/template-7.16.7" // {
dependencies = [
@@ -92522,7 +92546,7 @@ in
];
})
sources."requires-port-1.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-alpn-1.2.1"
(sources."resolve-cwd-2.0.0" // {
dependencies = [
@@ -93095,7 +93119,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- sources."@babel/core-7.16.10"
+ sources."@babel/core-7.16.12"
sources."@babel/generator-7.16.8"
sources."@babel/helper-annotate-as-pure-7.16.7"
sources."@babel/helper-compilation-targets-7.16.7"
@@ -93112,7 +93136,7 @@ in
sources."@babel/helper-validator-option-7.16.7"
sources."@babel/helpers-7.16.7"
sources."@babel/highlight-7.16.10"
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/plugin-proposal-object-rest-spread-7.16.7"
sources."@babel/plugin-syntax-jsx-7.16.7"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
@@ -93290,7 +93314,7 @@ in
})
sources."readable-stream-3.6.0"
sources."redent-3.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-3.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-3.0.2"
@@ -95595,7 +95619,7 @@ in
dependencies = [
sources."@babel/code-frame-7.16.7"
sources."@babel/compat-data-7.16.8"
- (sources."@babel/core-7.16.10" // {
+ (sources."@babel/core-7.16.12" // {
dependencies = [
sources."semver-6.3.0"
sources."source-map-0.5.7"
@@ -95628,7 +95652,7 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.16.10"
+ sources."@babel/parser-7.16.12"
sources."@babel/runtime-7.16.7"
sources."@babel/template-7.16.7"
sources."@babel/traverse-7.16.10"
@@ -96078,7 +96102,7 @@ in
sources."@octokit/plugin-paginate-rest-2.17.0"
sources."@octokit/plugin-request-log-1.0.4"
sources."@octokit/plugin-rest-endpoint-methods-5.13.0"
- sources."@octokit/request-5.6.2"
+ sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
sources."@octokit/types-6.34.0"
@@ -96164,7 +96188,7 @@ in
sources."read-pkg-up-7.0.1"
sources."rechoir-0.6.2"
sources."request-light-0.5.7"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."run-async-2.4.1"
sources."sanitize-filename-1.6.3"
sources."semver-7.3.5"
@@ -96891,7 +96915,7 @@ in
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."run-async-2.4.1"
@@ -98178,7 +98202,7 @@ in
sources."path-root-regex-0.1.2"
sources."picomatch-2.3.1"
sources."rechoir-0.7.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-dir-1.0.1"
sources."supports-preserve-symlinks-flag-1.0.0"
sources."to-regex-range-5.0.1"
@@ -98767,7 +98791,7 @@ in
sources."replace-homedir-1.0.0"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-dir-1.0.1"
sources."resolve-options-1.1.0"
sources."resolve-url-0.2.1"
@@ -99173,7 +99197,7 @@ in
sources."replace-homedir-1.0.0"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-dir-1.0.1"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
@@ -99329,14 +99353,14 @@ in
htmlhint = nodeEnv.buildNodePackage {
name = "htmlhint";
packageName = "htmlhint";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.0.tgz";
- sha512 = "+bsDBss95q0SdgVzPJ6Kqu8kSHu91/9rEFs8mIrobGrdV30EtNLyvqTL4xwl3q8GkzRn7lJxNNjwSGwiAoZkiw==";
+ url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.1.tgz";
+ sha512 = "d6k9QnjrLDl7FXNqyXHaEV5voTuaJYZ/iWkub1gMBwG40CvGJpxMbLb1vcw4eGxV1DOLNRk81WSkgHsjj6RVyA==";
};
dependencies = [
sources."ansi-styles-4.3.0"
- sources."async-3.2.2"
+ sources."async-3.2.3"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."chalk-4.1.2"
@@ -102025,30 +102049,31 @@ in
jsdoc = nodeEnv.buildNodePackage {
name = "jsdoc";
packageName = "jsdoc";
- version = "3.6.7";
+ version = "3.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz";
- sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw==";
+ url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz";
+ sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw==";
};
dependencies = [
sources."@babel/parser-7.16.12"
- sources."argparse-1.0.10"
+ sources."@types/linkify-it-3.0.2"
+ sources."@types/markdown-it-12.2.3"
+ sources."@types/mdurl-1.0.2"
+ sources."argparse-2.0.1"
sources."bluebird-3.7.2"
sources."catharsis-0.9.0"
- sources."entities-2.0.3"
+ sources."entities-2.1.0"
sources."escape-string-regexp-2.0.0"
- sources."graceful-fs-4.2.9"
sources."js2xmlparser-4.0.2"
- sources."klaw-3.0.0"
- sources."linkify-it-2.2.0"
+ sources."klaw-4.0.1"
+ sources."linkify-it-3.0.3"
sources."lodash-4.17.21"
- sources."markdown-it-10.0.0"
- sources."markdown-it-anchor-5.3.0"
- sources."marked-2.1.3"
+ sources."markdown-it-12.3.2"
+ sources."markdown-it-anchor-8.4.1"
+ sources."marked-4.0.10"
sources."mdurl-1.0.1"
sources."mkdirp-1.0.4"
sources."requizzle-0.2.3"
- sources."sprintf-js-1.0.3"
sources."strip-json-comments-3.1.1"
sources."taffydb-2.6.2"
sources."uc.micro-1.0.6"
@@ -102925,7 +102950,7 @@ in
})
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-url-0.2.1"
sources."ret-0.1.15"
sources."safe-buffer-5.1.2"
@@ -103103,7 +103128,7 @@ in
];
})
sources."@oclif/screen-1.0.4"
- (sources."@putdotio/api-client-8.22.0" // {
+ (sources."@putdotio/api-client-8.23.2" // {
dependencies = [
sources."axios-0.21.4"
];
@@ -103405,7 +103430,7 @@ in
sources."isbinaryfile-4.0.8"
sources."jsonfile-6.1.0"
sources."lodash-4.17.21"
- (sources."log4js-6.4.0" // {
+ (sources."log4js-6.4.1" // {
dependencies = [
sources."debug-4.3.3"
sources."ms-2.1.2"
@@ -104650,7 +104675,7 @@ in
sources."@octokit/plugin-paginate-rest-2.17.0"
sources."@octokit/plugin-request-log-1.0.4"
sources."@octokit/plugin-rest-endpoint-methods-5.13.0"
- (sources."@octokit/request-5.6.2" // {
+ (sources."@octokit/request-5.6.3" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
@@ -105016,7 +105041,7 @@ in
sources."ms-2.1.2"
sources."multimatch-5.0.0"
sources."mute-stream-0.0.8"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."neo-async-2.6.2"
(sources."node-fetch-2.6.7" // {
dependencies = [
@@ -105143,7 +105168,7 @@ in
sources."redent-3.0.0"
sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-cwd-3.0.0"
sources."resolve-from-5.0.0"
sources."restore-cursor-3.1.0"
@@ -107044,7 +107069,7 @@ in
sources."request-2.88.2"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
(sources."resolve-cwd-2.0.0" // {
dependencies = [
sources."resolve-from-3.0.0"
@@ -108099,7 +108124,7 @@ in
sources."replace-ext-0.0.1"
sources."request-2.88.0"
sources."require-uncached-1.0.3"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-1.0.1"
sources."restore-cursor-1.0.1"
sources."rimraf-2.6.3"
@@ -108792,7 +108817,7 @@ in
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."nopt-5.0.0"
sources."npmlog-6.0.0"
sources."once-1.4.0"
@@ -109053,7 +109078,7 @@ in
sources."qs-6.4.1"
];
})
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-2.2.8"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
@@ -109772,7 +109797,7 @@ in
];
})
sources."request-2.88.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."retry-0.10.1"
sources."rimraf-2.2.8"
sources."safe-buffer-5.2.1"
@@ -110431,7 +110456,7 @@ in
sources."redent-3.0.0"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
(sources."resolve-cwd-3.0.0" // {
dependencies = [
sources."resolve-from-5.0.0"
@@ -110718,7 +110743,7 @@ in
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."ms-2.1.2"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."node-gyp-8.4.1"
sources."nopt-5.0.0"
sources."normalize-url-4.5.1"
@@ -111954,7 +111979,7 @@ in
sources."request-2.88.2"
sources."request-promise-core-1.1.4"
sources."request-promise-native-1.0.9"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-3.0.0"
sources."resolve-url-0.2.1"
sources."restore-cursor-2.0.0"
@@ -112743,7 +112768,7 @@ in
sources."redent-1.0.0"
sources."regexp.prototype.flags-1.4.1"
sources."repeating-2.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."restore-cursor-2.0.0"
sources."reverse-http-1.3.0"
sources."rimraf-2.7.1"
@@ -113335,7 +113360,7 @@ in
sources."rc-1.2.8"
sources."readable-stream-2.3.7"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.1.2"
@@ -113565,7 +113590,7 @@ in
sources."readable-stream-1.1.14"
sources."readdirp-3.6.0"
sources."require-in-the-middle-5.1.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."run-series-1.1.9"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
@@ -114110,7 +114135,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-2.7.1"
sources."ripemd160-2.0.2"
sources."safe-buffer-5.2.1"
@@ -114350,10 +114375,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.212";
+ version = "1.1.214";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz";
- sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz";
+ sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -114500,7 +114525,7 @@ in
sources."reduce-flatten-1.0.1"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."semver-5.7.1"
@@ -116014,7 +116039,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."requires-port-1.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
(sources."resolve-cwd-2.0.0" // {
dependencies = [
sources."resolve-from-3.0.0"
@@ -116832,7 +116857,7 @@ in
sources."perfect-scrollbar-1.5.5"
sources."picomatch-2.3.1"
sources."pluralize-8.0.0"
- sources."polished-4.1.3"
+ sources."polished-4.1.4"
sources."postcss-value-parser-4.2.0"
sources."prismjs-1.26.0"
sources."process-0.11.10"
@@ -117047,7 +117072,7 @@ in
sources."read-pkg-3.0.0"
sources."read-pkg-up-3.0.0"
sources."redent-2.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."restore-cursor-3.1.0"
sources."scheduler-0.18.0"
sources."semver-5.7.1"
@@ -121538,7 +121563,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
sources."requires-port-1.0.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."ret-0.2.2"
sources."rethinkdb-2.4.2"
sources."retry-0.9.0"
@@ -121812,10 +121837,10 @@ in
stylelint = nodeEnv.buildNodePackage {
name = "stylelint";
packageName = "stylelint";
- version = "14.2.0";
+ version = "14.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz";
- sha512 = "i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==";
+ url = "https://registry.npmjs.org/stylelint/-/stylelint-14.3.0.tgz";
+ sha512 = "PZXSwtJe4f4qBPWBwAbHL0M0Qjrv8iHN+cLpUNsffaVMS3YzpDDRI73+2lsqLAYfQEzxRwpll6BDKImREbpHWA==";
};
dependencies = [
sources."@babel/code-frame-7.16.7"
@@ -121967,7 +121992,7 @@ in
})
sources."redent-3.0.0"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-5.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
@@ -121993,20 +122018,26 @@ in
sources."strip-indent-3.0.0"
sources."style-search-0.1.0"
sources."supports-color-5.5.0"
+ (sources."supports-hyperlinks-2.2.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
sources."supports-preserve-symlinks-flag-1.0.0"
sources."svg-tags-1.0.0"
sources."table-6.8.0"
sources."to-regex-range-5.0.1"
sources."trim-newlines-3.0.1"
sources."type-fest-0.18.1"
- sources."typedarray-to-buffer-3.1.5"
+ sources."typedarray-to-buffer-4.0.0"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
sources."v8-compile-cache-2.3.0"
sources."validate-npm-package-license-3.0.4"
sources."which-1.3.1"
sources."wrappy-1.0.2"
- sources."write-file-atomic-3.0.3"
+ sources."write-file-atomic-4.0.0"
sources."yallist-4.0.0"
sources."yaml-1.10.2"
sources."yargs-parser-20.2.9"
@@ -123124,7 +123155,7 @@ in
sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."readdirp-3.6.0"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
@@ -123555,7 +123586,7 @@ in
sources."remark-parse-9.0.0"
sources."repeat-string-1.6.1"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-2.6.3"
sources."semver-5.7.1"
(sources."slice-ansi-4.0.0" // {
@@ -123936,7 +123967,7 @@ in
sources."remark-retext-4.0.0"
sources."remark-stringify-8.1.1"
sources."repeat-string-1.6.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-5.0.0"
sources."responselike-1.0.2"
sources."retext-english-3.0.4"
@@ -127406,7 +127437,7 @@ in
sources."@octokit/plugin-paginate-rest-2.17.0"
sources."@octokit/plugin-request-log-1.0.4"
sources."@octokit/plugin-rest-endpoint-methods-5.13.0"
- sources."@octokit/request-5.6.2"
+ sources."@octokit/request-5.6.3"
sources."@octokit/request-error-2.1.0"
sources."@octokit/rest-18.12.0"
sources."@octokit/types-6.34.0"
@@ -128420,7 +128451,7 @@ in
sources."path-parse-1.0.7"
sources."readable-stream-3.6.0"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."rimraf-3.0.2"
sources."rw-1.3.3"
sources."safe-buffer-5.2.1"
@@ -128815,7 +128846,7 @@ in
sources."punycode-2.1.1"
sources."regexpp-3.2.0"
sources."require-from-string-2.0.2"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
sources."semver-7.3.5"
@@ -129081,7 +129112,7 @@ in
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
dependencies = [
sources."@discoveryjs/json-ext-0.5.6"
- sources."@types/eslint-8.4.0"
+ sources."@types/eslint-8.4.1"
sources."@types/eslint-scope-3.7.3"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.9"
@@ -129315,7 +129346,7 @@ in
sources."readdirp-3.5.0"
sources."rechoir-0.7.1"
sources."require-directory-2.1.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-cwd-3.0.0"
sources."resolve-from-5.0.0"
sources."safe-buffer-5.2.1"
@@ -130350,7 +130381,7 @@ in
sources."resolve-from-1.0.1"
];
})
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-from-5.0.0"
sources."resolve-url-0.2.1"
sources."responselike-1.0.2"
@@ -131444,7 +131475,7 @@ in
sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==";
};
dependencies = [
- sources."@types/eslint-8.4.0"
+ sources."@types/eslint-8.4.1"
sources."@types/eslint-scope-3.7.3"
sources."@types/estree-0.0.50"
sources."@types/json-schema-7.0.9"
@@ -131577,7 +131608,7 @@ in
sources."path-parse-1.0.7"
sources."pkg-dir-4.2.0"
sources."rechoir-0.7.1"
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."resolve-cwd-3.0.0"
sources."resolve-from-5.0.0"
sources."shallow-clone-3.0.1"
@@ -131729,7 +131760,7 @@ in
sources."http-errors-1.8.1"
sources."http-parser-js-0.5.5"
sources."http-proxy-1.18.1"
- sources."http-proxy-middleware-2.0.1"
+ sources."http-proxy-middleware-2.0.2"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
sources."ignore-5.2.0"
@@ -132904,7 +132935,7 @@ in
sources."ms-2.0.0"
sources."multimatch-5.0.0"
sources."mute-stream-0.0.7"
- sources."negotiator-0.6.2"
+ sources."negotiator-0.6.3"
sources."nice-try-1.0.5"
(sources."node-gyp-8.4.1" // {
dependencies = [
@@ -133114,7 +133145,7 @@ in
sources."tough-cookie-2.5.0"
];
})
- sources."resolve-1.21.1"
+ sources."resolve-1.22.0"
sources."responselike-1.0.2"
sources."restore-cursor-2.0.0"
sources."retry-0.12.0"
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 63056481199f..581890178eae 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -17,11 +17,12 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml ];
- createFindlibDestdir = true;
-
- buildPhase = "make all opt CPPFLAGS=-Wno-error";
-
- installPhase = "make install-opt";
+ buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ];
+ installTargets = "install-opt";
+ preInstall = ''
+ # Fix 'dllmllibvirt.so' install failure into non-existent directory.
+ mkdir -p $OCAMLFIND_DESTDIR/stublibs
+ '';
meta = with lib; {
description = "OCaml bindings for libvirt";
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 6588d6db7f45..192e7258c4c5 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,27 +1,42 @@
-{ lib, fetchurl, buildDunePackage
-, ppx_tools_versioned
-, ocaml-migrate-parsetree
+{ lib
+, fetchurl
+, buildDunePackage
+, ounit
+, ppx_deriving
+, ppx_sexp_conv
+, ppxlib
}:
+lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0")
+ "ppx_import is not available with ppxlib-${ppxlib.version}"
+
buildDunePackage rec {
pname = "ppx_import";
- version = "1.8.0";
+ version = "1.9.1";
useDune2 = true;
- minimumOCamlVersion = "4.04";
+ minimalOCamlVersion = "4.05";
src = fetchurl {
- url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz";
- sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv";
+ url = "https://github.com/ocaml-ppx/ppx_import/releases/download/${version}/ppx_import-${version}.tbz";
+ sha256 = "1li1f9b1i0yhjy655k74hgzhd05palz726zjbhwcy3iqxvi9id6i";
};
propagatedBuildInputs = [
- ppx_tools_versioned ocaml-migrate-parsetree
+ ppxlib
];
+ checkInputs = [
+ ounit
+ ppx_deriving
+ ppx_sexp_conv
+ ];
+
+ doCheck = true;
+
meta = {
- description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
+ description = "A syntax extension for importing declarations from interface files";
license = lib.licenses.mit;
homepage = "https://github.com/ocaml-ppx/ppx_import";
};
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 9d6e49cfdf0f..c8caf18aa176 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.19.3";
+ version = "3.19.4";
format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20=";
+ sha256 = "sha256-b/uAmrFdAtmXUjaW038mKeZgWHCSIEzCZvCy/9Z3ghw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index b51f5f165624..52cc85b48f61 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8=";
+ hash = "sha256-DN4oH3Ajppj3YDDj8O+WxBS2/5qKvmrK0OTLOdhAmww=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix
index 92e87e1ab1a3..664d523f94f0 100644
--- a/pkgs/development/python-modules/aiogithubapi/default.nix
+++ b/pkgs/development/python-modules/aiogithubapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiogithubapi";
- version = "22.1.0";
+ version = "22.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
- sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM=";
+ sha256 = "sha256-n6OkyMh3HxsFY2zXqbpdvbv5NdFC+J30tW/tLEEaSeU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 55153f5cf44d..1410d6a5a34d 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA=";
+ hash = "sha256-oPRytvSOjUoBUSQOFu5B/OljqmAk/rcRBl/oU+aSZjw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index 20272b35ca8b..797b320e4225 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "angrop";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA=";
+ hash = "sha256-hG/Im+gYBXIs1o7cw6LDS9nb2HPYjnSd7g8bpVG6rkE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index beae6671be4a..6d9d33e44944 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0=";
+ hash = "sha256-yIF9a63p8QnR1FazP/J8j9W8XnYAjWD9AKZHTGc4BfQ=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index f148f34e00e9..4186ad210c92 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
- version = "3.18.0";
+ version = "3.18.1";
src = fetchFromGitHub {
owner = "atlassian-api";
repo = pname;
rev = version;
- sha256 = "0akrwvq1f87lyckzwgpd16aljsbqjwwliv7j9czal7f216nbkvv6";
+ sha256 = "09xvkbdfhkrdkn8axb6bhi7p12lm2z1z84rx1wksfw9mffqk90v9";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix
index 03a4c80856d8..4a2a2803d3aa 100644
--- a/pkgs/development/python-modules/bandit/default.nix
+++ b/pkgs/development/python-modules/bandit/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "bandit";
- version = "1.7.1";
+ version = "1.7.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a81b00b5436e6880fa8ad6799bc830e02032047713cbb143a12939ac67eb756c";
+ sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index aeebc762701f..3991dc6bf685 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -1,27 +1,24 @@
-{ buildPythonPackage
-, fetchPypi
-, pytestCheckHook
-, coveralls
-, pytest-cov
+{ lib
+, buildPythonPackage
, cython
+, fetchPypi
, numpy
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "cftime";
- version = "1.5.1.1";
+ version = "1.5.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "6dc4d76ec7fe5a2d3c00dbe6604c757f1319613b75ef157554ef3648bf102a50";
+ sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a";
};
- checkInputs = [
- pytestCheckHook
- coveralls
- pytest-cov
- ];
-
nativeBuildInputs = [
cython
numpy
@@ -31,11 +28,22 @@ buildPythonPackage rec {
numpy
];
- # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft...
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
+ postPatch = ''
+ sed -i "/--cov/d" setup.cfg
+ '';
+
+ pythonImportsCheck = [
+ "cftime"
+ ];
+
+ meta = with lib; {
description = "Time-handling functionality from netcdf4-python";
+ homepage = "https://github.com/Unidata/cftime";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index f026f39ccf0f..479063d30698 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk=";
+ sha256 = "sha256-i2JrV9FEQyAzjdQUJb/b9MnET5h4ISTkcwc3n9poqtI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index abe85946260f..b6bfc86e2429 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.1.11508";
+ version = "9.1.11611";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8=";
+ hash = "sha256-0yuPY90YEgQvtcmQDPqCpBmKf4ZryJocwMr0O1upiS4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index 60df07076827..31be98f45912 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -17,13 +17,13 @@
}:
buildPythonPackage rec {
- version = "2021.11.30";
+ version = "2022.1.22";
pname = "dask-ml";
disabled = pythonOlder "3.6"; # >= 3.6
src = fetchPypi {
inherit pname version;
- sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a";
+ sha256 = "21a128e9f4f10e3b39cf82b36266eae28b17d16f2f6aa351bd73eb361e49326a";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix
index 7df195b3aacb..19c64fb5c996 100644
--- a/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/pkgs/development/python-modules/databricks-connect/default.nix
@@ -1,12 +1,22 @@
-{ lib, jdk8, buildPythonPackage, fetchPypi, six, py4j }:
+{ lib
+, jdk8
+, buildPythonPackage
+, fetchPypi
+, six
+, py4j
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "databricks-connect";
- version = "9.1.5";
+ version = "9.1.7";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "26b88b1d8fdacf5226cf9c1924fae974c955ccbfe2fdcd08574327007bdcbdd9";
+ sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41";
};
sourceRoot = ".";
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index e43f7d7f2d1d..a7ee6597b337 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -1,32 +1,51 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, requests, urllib3, mock, setuptools, stone }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, urllib3
+, mock
+, setuptools
+, stone
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "dropbox";
- version = "11.25.0";
+ version = "11.26.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dropbox";
repo = "dropbox-sdk-python";
rev = "v${version}";
- sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj";
+ sha256 = "0ncx41jg2wbsklqkrh0zjwjs3kfkscz8d6gcbsxqa1qpa3pa5519";
};
+ propagatedBuildInputs = [
+ requests
+ urllib3
+ mock
+ setuptools
+ stone
+ ];
+
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner == 5.2.0'," ""
'';
- propagatedBuildInputs = [ requests urllib3 mock setuptools stone ];
-
# Set DROPBOX_TOKEN environment variable to a valid token.
doCheck = false;
- pythonImportsCheck = [ "dropbox" ];
+ pythonImportsCheck = [
+ "dropbox"
+ ];
meta = with lib; {
- description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
- homepage = "https://www.dropbox.com/developers/core/docs";
+ description = "Python library for Dropbox's HTTP-based Core and Datastore APIs";
+ homepage = "https://github.com/dropbox/dropbox-sdk-python";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix
index d1325f6f0e10..73ede85fb886 100644
--- a/pkgs/development/python-modules/entrypoint2/default.nix
+++ b/pkgs/development/python-modules/entrypoint2/default.nix
@@ -1,31 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }:
+{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytestCheckHook }:
buildPythonPackage rec {
pname = "entrypoint2";
- version = "0.2.4";
+ version = "1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4770c3afcf3865c606a6e5f7cfcc5c59212f555fcee9b2540270399149c1dde3";
+ sha256 = "sha256-Z+kG9q2VjYP0i07ewo192CZw6SYZiPa0prY6vJ+zvlY=";
};
- propagatedBuildInputs = [ ];
-
pythonImportsCheck = [ "entrypoint2" ];
- # argparse is part of the standardlib
- prePatch = ''
- substituteInPlace setup.py --replace "argparse" ""
- '';
-
- checkInputs = [ EasyProcess pathpy pytest ];
-
- # 0.2.1 has incompatible pycache files included
- # https://github.com/ponty/entrypoint2/issues/8
- checkPhase = ''
- rm -rf tests/__pycache__
- pytest tests
- '';
+ checkInputs = [ EasyProcess pathpy pytestCheckHook ];
meta = with lib; {
description = "Easy to use command-line interface for python modules";
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 58f3224e70a2..3f8b2c1f814e 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "0.27.0";
+ version = "0.27.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-RPUj0We1nsKgAl1DTpa3pCD7gMm590N00+xwOVFIOaw=";
+ sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 0d54656c1586..31bf90f7f0ae 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "mat2";
- version = "0.12.2";
+ version = "0.12.3";
disabled = pythonOlder "3.5";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "jvoisin";
repo = "mat2";
rev = version;
- sha256 = "sha256-KaHdBmTeBlCRaVkG3WsfDtFo45s/X69x7VGDYY7W5O8=";
+ hash = "sha256-TW+FwlZ+J1tanPL5WuwXtZJmtYB9LaimeIaPlN/jzqo=";
};
patches = [
@@ -40,8 +40,6 @@ buildPythonPackage rec {
bwrap = "${bubblewrap}/bin/bwrap";
exiftool = "${exiftool}/bin/exiftool";
ffmpeg = "${ffmpeg}/bin/ffmpeg";
- # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master
- mimetypes = "${mime-types}/etc/mime.types";
} // lib.optionalAttrs dolphinIntegration {
kdialog = "${plasma5Packages.kdialog}/bin/kdialog";
}))
diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch
index 7e828d3f5339..50b0c9aaa789 100644
--- a/pkgs/development/python-modules/mat2/paths.patch
+++ b/pkgs/development/python-modules/mat2/paths.patch
@@ -1,5 +1,5 @@
diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
-index d365bc5..56313e2 100644
+index 41c8de4..11df258 100644
--- a/dolphin/mat2.desktop
+++ b/dolphin/mat2.desktop
@@ -8,6 +8,6 @@ Type=Service
@@ -7,11 +7,11 @@ index d365bc5..56313e2 100644
Name[de]=Metadaten löschen
Name[es]=Limpiar metadatos
-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
--Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
--Exec[de]=kdialog --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U
+-Exec=kdialog --yesno "$( mat2 -s %F )" --title "Clean Metadata?" && mat2 %U
+-Exec[de]=kdialog --yesno "$( mat2 -s %F )" --title "Metadaten löschen?" && mat2 %U
+Icon=@mat2svg@
-+Exec=@kdialog@ --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
-+Exec[de]=@kdialog@ --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U
++Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U
++Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U
diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
index 970d5dd..5d3c0b7 100644
--- a/libmat2/bubblewrap.py
@@ -76,20 +76,8 @@ index eb65b2a..51a0fa1 100644
-
- raise RuntimeError("Unable to find exiftool")
+ return '@exiftool@'
-diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py
-index 9965432..bd45179 100644
---- a/libmat2/parser_factory.py
-+++ b/libmat2/parser_factory.py
-@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS
-
- T = TypeVar('T', bound='abstract.AbstractParser')
-
-+mimetypes.init(['@mimetypes@'])
- mimetypes.add_type('application/epub+zip', '.epub')
- mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File
-
diff --git a/libmat2/video.py b/libmat2/video.py
-index b4a3232..3dd7ee5 100644
+index ae9e463..2acc65c 100644
--- a/libmat2/video.py
+++ b/libmat2/video.py
@@ -1,6 +1,4 @@
diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix
index e06d5aa3780b..6888356ec431 100644
--- a/pkgs/development/python-modules/moderngl_window/default.nix
+++ b/pkgs/development/python-modules/moderngl_window/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "moderngl_window";
- version = "2.1.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = version;
- sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q";
+ sha256 = "12a5nl01c9b1ww7sj7i02xa7zmlrgg8jvi8cz004hw98kjcs9li8";
};
propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ];
diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix
new file mode 100644
index 000000000000..fa094404b8b1
--- /dev/null
+++ b/pkgs/development/python-modules/nkdfu/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }:
+
+buildPythonPackage rec {
+ pname = "nkdfu";
+ version = "0.1";
+ format = "flit";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A=";
+ };
+
+ propagatedBuildInputs = [
+ fire
+ tqdm
+ intelhex
+ libusb1
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "nkdfu" ];
+
+ meta = with lib; {
+ description = "Python tool for Nitrokeys' firmware update";
+ homepage = "https://github.com/Nitrokey/nkdfu";
+ license = with licenses; [ gpl2Only ];
+ maintainers = with maintainers; [ frogamic ];
+ };
+}
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 223cf80604c4..8c922413cace 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "openai";
- version = "0.12.0";
+ version = "0.13.0";
disabled = pythonOlder "3.7.1";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "v${version}";
- sha256 = "12qkbaw1gyqhs6qwyj65g6l8v5xxnilwgk0gxlwnlzrr82q458ia";
+ sha256 = "sha256-y1ewaVwCcJGACwupGoh7zcKxE9qVXRjMf7k3q/hFhDE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index 40a4bf497f46..6464b376d60e 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -8,18 +8,21 @@
, pytest-vcr
, pytest-asyncio
, requests
-, six
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pubnub";
- version = "5.5.0";
+ version = "6.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = "python";
rev = "v${version}";
- sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh";
+ hash = "sha256-ktwPut4FBkPMukUk00I1xNOuTvSJkbskPOjoYDJN5Eg=";
};
propagatedBuildInputs = [
@@ -27,22 +30,24 @@ buildPythonPackage rec {
cbor2
pycryptodomex
requests
- six
];
checkInputs = [
pytest-asyncio
- pytestCheckHook
pytest-vcr
+ pytestCheckHook
];
- # Some tests don't pass with recent releases of twisted
disabledTestPaths = [
+ # Tests require network access
"tests/integrational"
- "tests/manual/asyncio"
+ "tests/manual"
+ "tests/functional/push"
];
- pythonImportsCheck = [ "pubnub" ];
+ pythonImportsCheck = [
+ "pubnub"
+ ];
meta = with lib; {
description = "Python-based APIs for PubNub";
diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
index 44c33a2d2e2e..fe418be71adb 100644
--- a/pkgs/development/python-modules/pydeconz/default.nix
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -10,14 +10,16 @@
buildPythonPackage rec {
pname = "pydeconz";
- version = "85";
+ version = "86";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
- sha256 = "sha256-6GTMG3BfHcfLMoyabFbhsJFVDHmEICuzf32603+jyZ4=";
+ sha256 = "sha256-NqNXbF5rGMCbugzZY+AQPPHYmQx/RrSwqtnoF1shSSU=";
};
propagatedBuildInputs = [
@@ -30,7 +32,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "pydeconz" ];
+ pythonImportsCheck = [
+ "pydeconz"
+ ];
meta = with lib; {
description = "Python library wrapping the Deconz REST API";
diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix
index 6c91b0c95dc0..41efa9a54d24 100644
--- a/pkgs/development/python-modules/pykrakenapi/default.nix
+++ b/pkgs/development/python-modules/pykrakenapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pykrakenapi";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "dominiktraxl";
repo = "pykrakenapi";
rev = "v${version}";
- sha256 = "0yvhgk5wyklwqd67hfajnd7ims79h4h89pp65xb3x5mcmdcfz4ss";
+ hash = "sha256-i2r6t+JcL6INI8Y26gvVvNjv6XxMj4G+pF9Xf/hsx1A=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix
index 9980d2384f9a..bd4a121d35be 100644
--- a/pkgs/development/python-modules/pypoint/default.nix
+++ b/pkgs/development/python-modules/pypoint/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pypoint";
- version = "2.2.1";
+ version = "2.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "fredrike";
repo = "pypoint";
rev = "v${version}";
- sha256 = "sha256-Or7A/Br6BgiCF6OHRtN5TAt++Tu1RLS9mYRgD7Aljts=";
+ hash = "sha256-609Zme9IUl8eHNxzrYsRAg7bgZho/OklGM7oI+imyZQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 77ca912db6c9..9b19c4c8a261 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pypugjs";
- version = "5.9.9";
+ version = "5.9.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0s0a239940z6rsssa13yz6pfkjk4300j35hs7qysyz45f3ixq19j";
+ sha256 = "082dae87d44e184030b66da9ea9bd1a0209f86c089d8f2bd61064b97a7511a28";
};
propagatedBuildInputs = [ six chardet ];
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 3b98b5738825..f6b84972324b 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -13,6 +13,7 @@
, withMultimedia ? false
, withWebKit ? false
, withWebSockets ? false
+, withLocation ? false
}:
let
@@ -59,6 +60,7 @@ in buildPythonPackage rec {
++ lib.optional withMultimedia qtmultimedia
++ lib.optional withWebKit qtwebkit
++ lib.optional withWebSockets qtwebsockets
+ ++ lib.optional withLocation qtlocation
;
buildInputs = with libsForQt5; [
@@ -71,6 +73,7 @@ in buildPythonPackage rec {
++ lib.optional withConnectivity qtconnectivity
++ lib.optional withWebKit qtwebkit
++ lib.optional withWebSockets qtwebsockets
+ ++ lib.optional withLocation qtlocation
;
propagatedBuildInputs = [
@@ -107,6 +110,7 @@ in buildPythonPackage rec {
++ lib.optional withWebKit "PyQt5.QtWebKit"
++ lib.optional withMultimedia "PyQt5.QtMultimedia"
++ lib.optional withConnectivity "PyQt5.QtConnectivity"
+ ++ lib.optional withLocation "PyQt5.QtPositioning"
;
meta = with lib; {
diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
index 17dbd579e841..760e86f6ecf2 100644
--- a/pkgs/development/python-modules/python-fsutil/default.nix
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python-fsutil";
- version = "0.5.0";
+ version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = version;
- hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ=";
+ hash = "sha256-DY0QGHD7HdLnKnbPV17UZl9u3Ac9YZdYvQXLOzmRGos=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix
index 1d1eb5ac54eb..f1f8be9d3d27 100644
--- a/pkgs/development/python-modules/python-izone/default.nix
+++ b/pkgs/development/python-modules/python-izone/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "python-izone";
- version = "1.2.3";
+ version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Swamp-Ig";
repo = "pizone";
rev = "v${version}";
- hash = "sha256-WF37t9vCEIyQMeN3/CWAiiZ5zsMRMFQ5UvMUqfoGM9I=";
+ hash = "sha256-HV8aQlwJ7VbGlJU0HpS9fK/QnRfYrk4ijKTGPWj0Jww=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 7b8aef7ec30d..b7558bc6315c 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.1.11508";
+ version = "9.1.11611";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME=";
+ hash = "sha256-HLnylnRBpPdGJKmhVYFEnvK2nJew0yfNDZyU5ly7xiw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix
index 29fffb1473be..ea5325ea660c 100644
--- a/pkgs/development/python-modules/qcengine/default.nix
+++ b/pkgs/development/python-modules/qcengine/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "qcengine";
- version = "0.21.0";
+ version = "0.22.0";
checkInputs = [ pytestCheckHook ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ZsPKvbaZ7BBZuOmzq12ism/HyWYcLlQHgZaTzmIsMq4=";
+ sha256 = "685a08247b561ed1c7a7b42e68293f90b412e83556626304a3f826a15be51308";
};
doCheck = true;
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 18e9e9e6c1a5..50d29c1923d2 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,15 +14,16 @@
buildPythonPackage rec {
pname = "regenmaschine";
- version = "2021.10.0";
+ version = "2022.01.0";
format = "pyproject";
- disabled = pythonOlder "3.6";
+
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-vMXDnnIQiRuyLvem1JKop6FJ0fhwR8xP0276PdZi/QI=";
+ sha256 = "sha256-TPiz3d1GbcIWCKRz3Hq4JU9+df/Fw4dUXQkIM6QO1Fs=";
};
nativeBuildInputs = [
@@ -42,7 +43,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "regenmaschine" ];
+ disabledTestPaths = [
+ # Examples are prefix with test_
+ "examples/"
+ ];
+
+ pythonImportsCheck = [
+ "regenmaschine"
+ ];
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix
index e1ee42b08157..30bf2a43b78e 100644
--- a/pkgs/development/python-modules/rokuecp/default.nix
+++ b/pkgs/development/python-modules/rokuecp/default.nix
@@ -2,6 +2,7 @@
, aiohttp
, aresponses
, buildPythonPackage
+, cachetools
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
@@ -12,20 +13,21 @@
buildPythonPackage rec {
pname = "rokuecp";
- version = "0.8.4";
+ version = "0.11.0";
format = "setuptools";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ctalkington";
repo = "python-rokuecp";
rev = version;
- sha256 = "sha256-vwXBYwiDQZBxEZDwLX9if6dt7tKQQOLyKL5m0q/3eUw=";
+ sha256 = "sha256-Y4Ge7IOR7//MJ0w7kdOgchLWFGR1qJbY0PSpJrjucaQ=";
};
propagatedBuildInputs = [
aiohttp
+ cachetools
xmltodict
yarl
];
diff --git a/pkgs/development/python-modules/schiene/default.nix b/pkgs/development/python-modules/schiene/default.nix
index 8f479500a138..952a00440d92 100644
--- a/pkgs/development/python-modules/schiene/default.nix
+++ b/pkgs/development/python-modules/schiene/default.nix
@@ -1,17 +1,21 @@
{ lib
+, beautifulsoup4
, buildPythonPackage
, fetchPypi
+, pythonOlder
, requests
-, beautifulsoup4
}:
buildPythonPackage rec {
pname = "schiene";
- version = "0.23";
+ version = "0.24";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "014aaxmk7yxyml1xgfk3zqallyb5zi04m0v7jgqjkbjqq4n4j3ck";
+ sha256 = "sha256-y1gbeavZNFniRiOBbJ4Mgmb0F01HedSmpAWaeZEv0Go=";
};
propagatedBuildInputs = [
@@ -19,10 +23,12 @@ buildPythonPackage rec {
beautifulsoup4
];
- # tests are not present
+ # Module has no tests
doCheck = false;
- pythonImportsCheck = [ "schiene" ];
+ pythonImportsCheck = [
+ "schiene"
+ ];
meta = with lib; {
description = "Python library for interacting with Bahn.de";
diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 59585ddc3fe0..c332a067a76b 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -24,14 +24,14 @@
buildPythonApplication rec {
pname = "trytond";
- version = "6.2.2";
+ version = "6.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193";
+ sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4";
};
# Tells the tests which database to use
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index c1d4328106ae..d8398ac40235 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.65";
+ version = "0.0.66";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
- sha256 = "sha256-3Lcmc95KotFMlL44zDugIQkHtplMMlyWjSb+SLehaqs=";
+ sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index ab6cbbeba5c9..ef92148a3139 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,13 +22,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.762";
+ version = "2.0.763";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- hash = "sha256-7YINKTvEAAOGoGkc4t2YwuMBF4rvOxRD2XhJxJBWvis=";
+ hash = "sha256-KqxFFRKOCDzlGVKYMp3YNWMKGdxXT9f6xwaCc5XIruk=";
};
nativeBuildInputs = with py.pkgs; [
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch
new file mode 100644
index 000000000000..1fa1e5748333
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/actions_path.patch
@@ -0,0 +1,41 @@
+diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
+index 6fff2af..7e2877e 100644
+--- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
++++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java
+@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider {
+ Map env, BinTools binTools, String fallbackTmpDir) {
+ ImmutableMap.Builder result = ImmutableMap.builder();
+ result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
++
++ // In case we are running on NixOS.
++ // If bash is called with an unset PATH on this platform,
++ // it will set it to /no-such-path and default tools will be missings.
++ // See, https://github.com/NixOS/nixpkgs/issues/94222
++ // So we ensure that minimal dependencies are present.
++ if (!env.containsKey("PATH")){
++ result.put("PATH", "@actionsPathPatch@");
++ }
++
+ String p = clientEnv.get("TMPDIR");
+ if (Strings.isNullOrEmpty(p)) {
+ // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
+index 95642767c6..39d3c62461 100644
+--- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
++++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
+@@ -74,6 +74,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider {
+
+ ImmutableMap.Builder newEnvBuilder = ImmutableMap.builder();
+ newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR")));
++
++ // In case we are running on NixOS.
++ // If bash is called with an unset PATH on this platform,
++ // it will set it to /no-such-path and default tools will be missings.
++ // See, https://github.com/NixOS/nixpkgs/issues/94222
++ // So we ensure that minimal dependencies are present.
++ if (!env.containsKey("PATH")){
++ newEnvBuilder.put("PATH", "@actionsPathPatch@");
++ }
++
+ String p = clientEnv.get("TMPDIR");
+ if (Strings.isNullOrEmpty(p)) {
+ // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
new file mode 100644
index 000000000000..8770174ab26c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -0,0 +1,669 @@
+{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles
+, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
+# this package (through the fixpoint glass)
+, bazel_self
+# needed only for the updater
+, bazel_4
+, lr, xe, zip, unzip, bash, writeCBin, coreutils
+, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
+# updater
+, python27, python3, writeScript
+# Apple dependencies
+, cctools, libcxx, CoreFoundation, CoreServices, Foundation
+# Allow to independently override the jdks used to build and run respectively
+, buildJdk, runJdk
+, runtimeShell
+# Downstream packages for tests
+, bazel-watcher
+# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
+# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
+, enableNixHacks ? false
+, gcc-unwrapped
+, autoPatchelfHook
+, file
+, substituteAll
+, writeTextFile
+}:
+
+let
+ version = "5.0.0";
+ sourceRoot = ".";
+
+ src = fetchurl {
+ url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
+ sha256 = "By3WLSN9vBHgusAuEY2MLbTQujugnxoOseKkYPuEGds=";
+ };
+
+ # Update with `eval $(nix-build -A bazel.updater)`,
+ # then add new dependencies from the dict in ./src-deps.json as required.
+ srcDeps = lib.attrsets.attrValues srcDepsSet;
+ srcDepsSet =
+ let
+ srcs = lib.importJSON ./src-deps.json;
+ toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
+ urls = d.urls;
+ sha256 = d.sha256;
+ });
+ in builtins.listToAttrs (map toFetchurl [
+ srcs.desugar_jdk_libs
+ srcs.io_bazel_skydoc
+ srcs.bazel_skylib
+ srcs.bazelci_rules
+ srcs.io_bazel_rules_sass
+ srcs.platforms
+ srcs."remote_java_tools_for_testing"
+ srcs."coverage_output_generator-v2.5.zip"
+ srcs.build_bazel_rules_nodejs
+ srcs."android_tools_pkg-0.23.0.tar.gz"
+ srcs.bazel_toolchains
+ srcs.com_github_grpc_grpc
+ srcs.upb
+ srcs.com_google_protobuf
+ srcs.rules_pkg
+ srcs.rules_cc
+ srcs.rules_java
+ srcs.rules_proto
+ srcs.com_google_absl
+ srcs.com_googlesource_code_re2
+ srcs.com_github_cares_cares
+ ]);
+
+ distDir = runCommand "bazel-deps" {} ''
+ mkdir -p $out
+ for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+ '';
+
+ defaultShellUtils =
+ # Keep this list conservative. For more exotic tools, prefer to use
+ # @rules_nixpkgs to pull in tools from the nix repository. Example:
+ #
+ # WORKSPACE:
+ #
+ # nixpkgs_git_repository(
+ # name = "nixpkgs",
+ # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
+ # )
+ #
+ # # This defines an external Bazel workspace.
+ # nixpkgs_package(
+ # name = "bison",
+ # repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
+ # )
+ #
+ # some/BUILD.bazel:
+ #
+ # genrule(
+ # ...
+ # cmd = "$(location @bison//:bin/bison) -other -args",
+ # tools = [
+ # ...
+ # "@bison//:bin/bison",
+ # ],
+ # )
+ #
+ # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
+ # default to using python3. Therefore, both python27 and python3 are
+ # runtime dependencies.
+ [
+ bash
+ coreutils
+ file
+ findutils
+ gawk
+ gnugrep
+ gnused
+ gnutar
+ gzip
+ python27
+ python3
+ unzip
+ which
+ zip
+ ];
+
+ defaultShellPath = lib.makeBinPath defaultShellUtils;
+
+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
+
+ system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
+ arch = stdenv.hostPlatform.parsed.cpu.name;
+
+ bazelRC = writeTextFile {
+ name = "bazel-rc";
+ text = ''
+ startup --server_javabase=${runJdk}
+
+ # Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
+ # Most commands inherit from 'build' anyway.
+ build --distdir=${distDir}
+ fetch --distdir=${distDir}
+ query --distdir=${distDir}
+
+ build --extra_toolchains=@bazel_tools//tools/jdk:nonprebuilt_toolchain_definition
+ build --tool_java_runtime_version=local_jdk_11
+ build --java_runtime_version=local_jdk_11
+
+ # load default location for the system wide configuration
+ try-import /etc/bazel.bazelrc
+ '';
+ };
+
+in
+stdenv.mkDerivation rec {
+ pname = "bazel";
+ inherit version;
+
+ meta = with lib; {
+ homepage = "https://github.com/bazelbuild/bazel/";
+ description = "Build tool that builds code quickly and reliably";
+ license = licenses.asl20;
+ maintainers = lib.teams.bazel.members;
+ inherit platforms;
+ };
+
+ inherit src;
+ inherit sourceRoot;
+ patches = [
+ # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
+ # This is breaking the build of any C target. This patch removes the last
+ # argument if it's found to be an empty string.
+ ../trim-last-argument-to-gcc-if-empty.patch
+
+ # On Darwin, using clang 6 to build fails because of a linker error (see #105573),
+ # but using clang 7 fails because libarclite_macosx.a cannot be found when linking
+ # the xcode_locator tool.
+ # This patch removes using the -fobjc-arc compiler option and makes the code
+ # compile without automatic reference counting. Caveat: this leaks memory, but
+ # we accept this fact because xcode_locator is only a short-lived process used during the build.
+ (substituteAll {
+ src = ./no-arc.patch;
+ multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64";
+ })
+
+ # --experimental_strict_action_env (which may one day become the default
+ # see bazelbuild/bazel#2574) hardcodes the default
+ # action environment to a non hermetic value (e.g. "/usr/local/bin").
+ # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
+ # So we are replacing this bazel paths by defaultShellPath,
+ # improving hermeticity and making it work in nixos.
+ (substituteAll {
+ src = ../strict_action_env.patch;
+ strictActionEnvPatch = defaultShellPath;
+ })
+
+ (substituteAll {
+ src = ./actions_path.patch;
+ actionsPathPatch = defaultShellPath;
+ })
+
+ # bazel reads its system bazelrc in /etc
+ # override this path to a builtin one
+ (substituteAll {
+ src = ../bazel_rc.patch;
+ bazelSystemBazelRCPath = bazelRC;
+ })
+ ] ++ lib.optional enableNixHacks ../nix-hacks.patch;
+
+
+ # Additional tests that check bazel’s functionality. Execute
+ #
+ # nix-build . -A bazel.tests
+ #
+ # in the nixpkgs checkout root to exercise them locally.
+ passthru.tests =
+ let
+ runLocal = name: attrs: script:
+ let
+ attrs' = removeAttrs attrs [ "buildInputs" ];
+ buildInputs = [ python3 which ] ++ (attrs.buildInputs or []);
+ in
+ runCommandCC name ({
+ inherit buildInputs;
+ preferLocalBuild = true;
+ meta.platforms = platforms;
+ } // attrs') script;
+
+ # bazel wants to extract itself into $install_dir/install every time it runs,
+ # so let’s do that only once.
+ extracted = bazelPkg:
+ let install_dir =
+ # `install_base` field printed by `bazel info`, minus the hash.
+ # yes, this path is kinda magic. Sorry.
+ "$HOME/.cache/bazel/_bazel_nixbld";
+ in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
+ export HOME=$(mktemp -d)
+ touch WORKSPACE # yeah, everything sucks
+ install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
+ # assert it’s actually below install_dir
+ [[ "$install_base" =~ ${install_dir} ]] \
+ || (echo "oh no! $install_base but we are \
+ trying to copy ${install_dir} to $out instead!"; exit 1)
+ cp -R ${install_dir} $out
+ '';
+
+ bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
+ let
+ be = extracted bazelPkg;
+ in runLocal name { inherit buildInputs; } (
+ # skip extraction caching on Darwin, because nobody knows how Darwin works
+ (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+ # set up home with pre-unpacked bazel
+ export HOME=$(mktemp -d)
+ mkdir -p ${be.install_dir}
+ cp -R ${be}/install ${be.install_dir}
+
+ # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
+ # Bazel checks whether the mtime of the install dir files
+ # is >9 years in the future, otherwise it extracts itself again.
+ # see PosixFileMTime::IsUntampered in src/main/cpp/util
+ # What the hell bazel.
+ ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
+ '')
+ +
+ ''
+ # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
+ # about why to create a subdir for the workspace.
+ cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
+
+ ${bazelScript}
+
+ touch $out
+ '');
+
+ bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
+
+ bazel-examples = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "examples";
+ rev = "4183fc709c26a00366665e2d60d70521dc0b405d";
+ sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
+ };
+
+ in (if !stdenv.hostPlatform.isDarwin then {
+ # `extracted` doesn’t work on darwin
+ shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
+ } else {}) // {
+ bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; };
+ cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+ java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+ protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; };
+ pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
+
+ bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+
+ cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+ javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+ protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+ pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+
+ # downstream packages using buildBazelPackage
+ # fixed-output hashes of the fetch phase need to be spot-checked manually
+ downstream = recurseIntoAttrs ({
+ inherit bazel-watcher;
+ }
+ # dm-sonnet is only packaged for linux
+ // (lib.optionalAttrs stdenv.isLinux {
+ # TODO(timokau) dm-sonnet is broken currently
+ # dm-sonnet-linux = python3.pkgs.dm-sonnet;
+ }));
+ };
+
+ src_for_updater = stdenv.mkDerivation rec {
+ name = "updater-sources";
+ inherit src;
+ nativeBuildInputs = [ unzip ];
+ inherit sourceRoot;
+ installPhase = ''
+ runHook preInstall
+
+ cp -r . "$out"
+
+ runHook postInstall
+ '';
+ };
+ # update the list of workspace dependencies
+ passthru.updater = writeScript "update-bazel-deps.sh" ''
+ #!${runtimeShell}
+ (cd "${src_for_updater}" &&
+ BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
+ "${bazel_4}"/bin/bazel \
+ query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
+ --loading_phase_threads=1 \
+ --output build) \
+ | "${python3}"/bin/python3 "${./update-srcDeps.py}" \
+ "${builtins.toString ./src-deps.json}"
+ '';
+
+ # Necessary for the tests to pass on Darwin with sandbox enabled.
+ # Bazel starts a local server and needs to bind a local address.
+ __darwinAllowLocalNetworking = true;
+
+ postPatch = let
+
+ darwinPatches = ''
+ bazelLinkFlags () {
+ eval set -- "$NIX_LDFLAGS"
+ local flag
+ for flag in "$@"; do
+ printf ' -Wl,%s' "$flag"
+ done
+ }
+
+ # Disable Bazel's Xcode toolchain detection which would configure compilers
+ # and linkers from Xcode instead of from PATH
+ export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+ # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
+ export GCOV=${coreutils}/bin/false
+
+ # Framework search paths aren't added by bintools hook
+ # https://github.com/NixOS/nixpkgs/pull/41914
+ export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+
+ # libcxx includes aren't added by libcxx hook
+ # https://github.com/NixOS/nixpkgs/pull/41589
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
+
+ # don't use system installed Xcode to run clang, use Nix clang instead
+ sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
+ scripts/bootstrap/compile.sh \
+ tools/osx/BUILD
+
+ substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
+
+ # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
+ sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc
+
+ # clang installed from Xcode has a compatibility wrapper that forwards
+ # invocations of gcc to clang, but vanilla clang doesn't
+ sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
+
+ sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
+ wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
+ for wrapper in "''${wrappers[@]}"; do
+ sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
+ done
+ '';
+
+ genericPatches = ''
+ # Substitute j2objc and objc wrapper's python shebang to plain python path.
+ # These scripts explicitly depend on Python 2.7, hence we use python27.
+ # See also `postFixup` where python27 is added to $out/nix-support
+ substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+ substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+ substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+
+ # md5sum is part of coreutils
+ sed -i 's|/sbin/md5|md5sum|g' \
+ src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
+
+ # replace initial value of pythonShebang variable in BazelPythonSemantics.java
+ substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
+ --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
+
+ substituteInPlace src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java \
+ --replace '"#!/usr/bin/env python3"' "\"#!${python3}/bin/python\""
+
+ # substituteInPlace is rather slow, so prefilter the files with grep
+ grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
+ # If you add more replacements here, you must change the grep above!
+ # Only files containing /bin are taken into account.
+ # We default to python3 where possible. See also `postFixup` where
+ # python3 is added to $out/nix-support
+ substituteInPlace "$path" \
+ --replace /bin/bash ${bash}/bin/bash \
+ --replace "/usr/bin/env bash" ${bash}/bin/bash \
+ --replace "/usr/bin/env python" ${python3}/bin/python \
+ --replace /usr/bin/env ${coreutils}/bin/env \
+ --replace /bin/true ${coreutils}/bin/true
+ done
+
+ grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
+ substituteInPlace "$path" \
+ --replace "/usr/bin/env python2" ${python27}/bin/python \
+ --replace "/usr/bin/env python3" ${python3}/bin/python \
+ --replace /usr/bin/env ${coreutils}/bin/env
+ done
+
+ # bazel test runner include references to /bin/bash
+ substituteInPlace tools/build_rules/test_rules.bzl \
+ --replace /bin/bash ${bash}/bin/bash
+
+ for i in $(find tools/cpp/ -type f)
+ do
+ substituteInPlace $i \
+ --replace /bin/bash ${bash}/bin/bash
+ done
+
+ # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
+ substituteInPlace scripts/bootstrap/compile.sh \
+ --replace /bin/bash ${bash}/bin/bash
+
+ # add nix environment vars to .bazelrc
+ cat >> .bazelrc <> tools/jdk/BUILD.tools <> third_party/grpc/bazel_1.41.0.patch <> runfiles.bash.tmp
+ cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
+ mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
+
+ patchShebangs .
+ '';
+ in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+ + genericPatches;
+
+ buildInputs = [buildJdk] ++ defaultShellUtils;
+
+ # when a command can’t be found in a bazel build, you might also
+ # need to add it to `defaultShellPath`.
+ nativeBuildInputs = [
+ coreutils
+ installShellFiles
+ makeWrapper
+ python3
+ unzip
+ which
+ zip
+ python3.pkgs.absl-py # Needed to build fish completion
+ ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
+
+ # Bazel makes extensive use of symlinks in the WORKSPACE.
+ # This causes problems with infinite symlinks if the build output is in the same location as the
+ # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
+ # subdirectory.
+ # Failing to do this causes "infinite symlink expansion detected"
+ preBuildPhases = ["preBuildPhase"];
+ preBuildPhase = ''
+ mkdir bazel_src
+ shopt -s dotglob extglob
+ mv !(bazel_src) bazel_src
+ '';
+ buildPhase = ''
+ runHook preBuild
+
+ # Increasing memory during compilation might be necessary.
+ # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
+
+ # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md
+ # and `git rev-parse --short HEAD` which would result in
+ # "3.7.0- (@non-git)" due to non-git build and incomplete changelog.
+ # Actual bazel releases use scripts/release/common.sh which is based
+ # on branch/tag information which we don't have with tarball releases.
+ # Note that .bazelversion is always correct and is based on bazel-*
+ # executable name, version checks should work fine
+ export EMBED_LABEL="${version}- (@non-git)"
+ ${bash}/bin/bash ./bazel_src/compile.sh
+ ./bazel_src/scripts/generate_bash_completion.sh \
+ --bazel=./bazel_src/output/bazel \
+ --output=./bazel_src/output/bazel-complete.bash \
+ --prepend=./bazel_src/scripts/bazel-complete-header.bash \
+ --prepend=./bazel_src/scripts/bazel-complete-template.bash
+ ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
+ --bazel=./bazel_src/output/bazel \
+ --output=./bazel_src/output/bazel-complete.fish
+
+ # need to change directory for bazel to find the workspace
+ cd ./bazel_src
+ # build execlog tooling
+ export HOME=$(mktemp -d)
+ ./output/bazel build src/tools/execlog:parser_deploy.jar
+ cd -
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+
+ # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
+ # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
+ # The binary _must_ exist with this naming if your project contains a .bazelversion
+ # file.
+ cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
+ mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
+
+ mkdir $out/share
+ cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
+ cat < $out/bin/bazel-execlog
+ #!${runtimeShell} -e
+ ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
+ EOF
+ chmod +x $out/bin/bazel-execlog
+
+ # shell completion files
+ installShellCompletion --bash \
+ --name bazel.bash \
+ ./bazel_src/output/bazel-complete.bash
+ installShellCompletion --zsh \
+ --name _bazel \
+ ./bazel_src/scripts/zsh_completion/_bazel
+ installShellCompletion --fish \
+ --name bazel.fish \
+ ./bazel_src/output/bazel-complete.fish
+ '';
+
+ # Install check fails on `aarch64-darwin`
+ # https://github.com/NixOS/nixpkgs/issues/145587
+ doInstallCheck = stdenv.hostPlatform.system != "aarch64-darwin";
+ installCheckPhase = ''
+ export TEST_TMPDIR=$(pwd)
+
+ hello_test () {
+ $out/bin/bazel test \
+ --test_output=errors \
+ examples/cpp:hello-success_test \
+ examples/java-native/src/test/java/com/example/myproject:hello
+ }
+
+ cd ./bazel_src
+
+ # test whether $WORKSPACE_ROOT/tools/bazel works
+
+ mkdir -p tools
+ cat > tools/bazel <<"EOF"
+ #!${runtimeShell} -e
+ exit 1
+ EOF
+ chmod +x tools/bazel
+
+ # first call should fail if tools/bazel is used
+ ! hello_test
+
+ cat > tools/bazel <<"EOF"
+ #!${runtimeShell} -e
+ exec "$BAZEL_REAL" "$@"
+ EOF
+
+ # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
+ hello_test
+
+ runHook postInstall
+ '';
+
+ # Save paths to hardcoded dependencies so Nix can detect them.
+ # This is needed because the templates get tar’d up into a .jar.
+ postFixup = ''
+ mkdir -p $out/nix-support
+ echo "${defaultShellPath}" >> $out/nix-support/depends
+ # The string literal specifying the path to the bazel-rc file is sometimes
+ # stored non-contiguously in the binary due to gcc optimisations, which leads
+ # Nix to miss the hash when scanning for dependencies
+ echo "${bazelRC}" >> $out/nix-support/depends
+ '' + lib.optionalString stdenv.isDarwin ''
+ echo "${cctools}" >> $out/nix-support/depends
+ '';
+
+ dontStrip = true;
+ dontPatchELF = true;
+}
+
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
new file mode 100644
index 000000000000..95d70a9db38e
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch
@@ -0,0 +1,42 @@
+diff --git a/tools/osx/BUILD b/tools/osx/BUILD
+index 990afe3e8c..cd5b7b1b7a 100644
+--- a/tools/osx/BUILD
++++ b/tools/osx/BUILD
+@@ -28,8 +28,8 @@ exports_files([
+ ])
+
+ DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
+- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
+- -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
++ -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
+ env -i codesign --identifier $@ --force --sign - $@
+ """
+
+diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
+index 2b819f07ec..a98ce37673 100644
+--- a/tools/osx/xcode_configure.bzl
++++ b/tools/osx/xcode_configure.bzl
+@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
+ "macosx",
+ "clang",
+ "-mmacosx-version-min=10.9",
+- "-fobjc-arc",
+ "-framework",
+ "CoreServices",
+ "-framework",
+diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
+index ed2ef87453..e0ce6dbdd1 100644
+--- a/tools/osx/xcode_locator.m
++++ b/tools/osx/xcode_locator.m
+@@ -21,10 +21,6 @@
+ // 6,6.4,6.4.1 = 6.4.1
+ // 6.3,6.3.0 = 6.3
+
+-#if !defined(__has_feature) || !__has_feature(objc_arc)
+-#error "This file requires ARC support."
+-#endif
+-
+ #import
+ #import
+
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
new file mode 100644
index 000000000000..ff010d01aa08
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json
@@ -0,0 +1,1990 @@
+{
+ "1.25.0.zip": {
+ "name": "1.25.0.zip",
+ "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
+ "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
+ ]
+ },
+ "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
+ "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
+ ]
+ },
+ "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": {
+ "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
+ "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
+ "urls": [
+ "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz"
+ ]
+ },
+ "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": {
+ "name": "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
+ "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
+ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
+ ]
+ },
+ "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
+ "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+ ]
+ },
+ "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": {
+ "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
+ "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
+ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
+ ]
+ },
+ "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz": {
+ "name": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
+ "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
+ "urls": [
+ "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz"
+ ]
+ },
+ "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": {
+ "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
+ "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
+ "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz"
+ ]
+ },
+ "android_tools": {
+ "name": "android_tools",
+ "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
+ },
+ "android_tools_for_testing": {
+ "name": "android_tools_for_testing",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
+ "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
+ },
+ "android_tools_pkg-0.23.0.tar.gz": {
+ "name": "android_tools_pkg-0.23.0.tar.gz",
+ "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
+ "urls": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
+ ]
+ },
+ "b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
+ "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
+ ]
+ },
+ "bazel-skylib-1.0.3.tar.gz": {
+ "name": "bazel-skylib-1.0.3.tar.gz",
+ "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
+ ]
+ },
+ "bazel_compdb": {
+ "generator_function": "grpc_deps",
+ "generator_name": "bazel_compdb",
+ "name": "bazel_compdb",
+ "sha256": "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4",
+ "strip_prefix": "bazel-compilation-database-0.4.5",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
+ "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz"
+ ]
+ },
+ "bazel_gazelle": {
+ "generator_function": "grpc_deps",
+ "generator_name": "bazel_gazelle",
+ "name": "bazel_gazelle",
+ "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493",
+ "strip_prefix": "bazel-gazelle-0.19.1",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz",
+ "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz"
+ ]
+ },
+ "bazel_j2objc": {
+ "name": "bazel_j2objc",
+ "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
+ "strip_prefix": "j2objc-2.5",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
+ "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
+ ]
+ },
+ "bazel_skylib": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "bazel_skylib",
+ "name": "bazel_skylib",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz"
+ ]
+ },
+ "bazel_toolchains": {
+ "generator_function": "grpc_deps",
+ "generator_name": "bazel_toolchains",
+ "name": "bazel_toolchains",
+ "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10",
+ "strip_prefix": "bazel-toolchains-1.0.1",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz",
+ "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz"
+ ]
+ },
+ "bazel_website": {
+ "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n",
+ "name": "bazel_website",
+ "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4",
+ "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42",
+ "urls": [
+ "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz"
+ ]
+ },
+ "bazelci_rules": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "bazelci_rules",
+ "name": "bazelci_rules",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
+ "strip_prefix": "bazelci_rules-1.0.0",
+ "urls": [
+ "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
+ ]
+ },
+ "bazelci_rules-1.0.0.tar.gz": {
+ "name": "bazelci_rules-1.0.0.tar.gz",
+ "sha256": "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
+ "urls": [
+ "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz"
+ ]
+ },
+ "boringssl": {
+ "generator_function": "grpc_deps",
+ "generator_name": "boringssl",
+ "name": "boringssl",
+ "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308",
+ "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz",
+ "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz"
+ ]
+ },
+ "build_bazel_apple_support": {
+ "generator_function": "grpc_deps",
+ "generator_name": "build_bazel_apple_support",
+ "name": "build_bazel_apple_support",
+ "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz",
+ "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz"
+ ]
+ },
+ "build_bazel_rules_apple": {
+ "generator_function": "grpc_deps",
+ "generator_name": "build_bazel_rules_apple",
+ "name": "build_bazel_rules_apple",
+ "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e",
+ "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz",
+ "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz"
+ ]
+ },
+ "build_bazel_rules_nodejs": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "build_bazel_rules_nodejs",
+ "name": "build_bazel_rules_nodejs",
+ "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
+ "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz"
+ ]
+ },
+ "com_envoyproxy_protoc_gen_validate": {
+ "generator_function": "grpc_deps",
+ "generator_name": "com_envoyproxy_protoc_gen_validate",
+ "name": "com_envoyproxy_protoc_gen_validate",
+ "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2",
+ "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz",
+ "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz"
+ ]
+ },
+ "com_github_cares_cares": {
+ "build_file": "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "com_github_cares_cares",
+ "name": "com_github_cares_cares",
+ "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
+ "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
+ "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
+ ]
+ },
+ "com_github_google_benchmark": {
+ "generator_function": "grpc_deps",
+ "generator_name": "com_github_google_benchmark",
+ "name": "com_github_google_benchmark",
+ "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86",
+ "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz",
+ "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz"
+ ]
+ },
+ "com_github_grpc_grpc": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "com_github_grpc_grpc",
+ "name": "com_github_grpc_grpc",
+ "patch_args": [
+ "-p1"
+ ],
+ "patches": [
+ "//third_party/grpc:grpc_1.41.0.patch"
+ ],
+ "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656",
+ "strip_prefix": "grpc-1.41.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz",
+ "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz"
+ ]
+ },
+ "com_google_absl": {
+ "generator_function": "grpc_deps",
+ "generator_name": "com_google_absl",
+ "name": "com_google_absl",
+ "sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
+ "strip_prefix": "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz"
+ ]
+ },
+ "com_google_googleapis": {
+ "generator_function": "grpc_deps",
+ "generator_name": "com_google_googleapis",
+ "name": "com_google_googleapis",
+ "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0",
+ "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz",
+ "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"
+ ]
+ },
+ "com_google_googletest": {
+ "name": "com_google_googletest",
+ "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
+ "strip_prefix": "googletest-release-1.10.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
+ "https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
+ ]
+ },
+ "com_google_protobuf": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "com_google_protobuf",
+ "name": "com_google_protobuf",
+ "patch_args": [
+ "-p1"
+ ],
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "patches": [
+ "//third_party/protobuf:3.13.0.patch"
+ ],
+ "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
+ "strip_prefix": "protobuf-3.13.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
+ ]
+ },
+ "com_google_testparameterinjector": {
+ "build_file_content": "\njava_library(\n name = \"testparameterinjector\",\n testonly = True,\n srcs = glob([\"src/main/**/*.java\"]),\n deps = [\n \"@org_snakeyaml//:snakeyaml\",\n \"@//third_party:auto_value\",\n \"@//third_party:guava\",\n \"@//third_party:junit4\",\n \"@//third_party/protobuf:protobuf_java\",\n ],\n visibility = [\"//visibility:public\"],\n)\n",
+ "name": "com_google_testparameterinjector",
+ "sha256": "562a0e87eb413a7dcad29ebc8d578f6f97503473943585b051c1398a58189b06",
+ "strip_prefix": "TestParameterInjector-1.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/TestParameterInjector/archive/v1.0.tar.gz",
+ "https://github.com/google/TestParameterInjector/archive/v1.0.tar.gz"
+ ]
+ },
+ "com_googlesource_code_re2": {
+ "generator_function": "grpc_deps",
+ "generator_name": "com_googlesource_code_re2",
+ "name": "com_googlesource_code_re2",
+ "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
+ "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
+ "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz"
+ ]
+ },
+ "coverage_output_generator-v2.5.zip": {
+ "name": "coverage_output_generator-v2.5.zip",
+ "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
+ ]
+ },
+ "cython": {
+ "build_file": "@com_github_grpc_grpc//third_party:cython.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "cython",
+ "name": "cython",
+ "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079",
+ "strip_prefix": "cython-0.29.21",
+ "urls": [
+ "https://github.com/cython/cython/archive/0.29.21.tar.gz"
+ ]
+ },
+ "desugar_jdk_libs": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "desugar_jdk_libs",
+ "name": "desugar_jdk_libs",
+ "sha256": "299452e6f4a4981b2e6d22357f7332713382a63e4c137f5fd6b89579f6d610cb",
+ "strip_prefix": "desugar_jdk_libs-5847d6a06302136d95a14b4cbd4b55a9c9f1436e",
+ "urls": [
+ "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip",
+ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip"
+ ]
+ },
+ "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": {
+ "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
+ "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
+ "urls": [
+ "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
+ "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
+ ]
+ },
+ "enum34": {
+ "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "enum34",
+ "name": "enum34",
+ "sha256": "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
+ "strip_prefix": "enum34-1.1.6",
+ "urls": [
+ "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"
+ ]
+ },
+ "envoy_api": {
+ "generator_function": "grpc_deps",
+ "generator_name": "envoy_api",
+ "name": "envoy_api",
+ "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5",
+ "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz",
+ "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz"
+ ]
+ },
+ "futures": {
+ "build_file": "@com_github_grpc_grpc//third_party:futures.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "futures",
+ "name": "futures",
+ "sha256": "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794",
+ "strip_prefix": "futures-3.3.0",
+ "urls": [
+ "https://files.pythonhosted.org/packages/47/04/5fc6c74ad114032cd2c544c575bffc17582295e9cd6a851d6026ab4b2c00/futures-3.3.0.tar.gz"
+ ]
+ },
+ "io_bazel_rules_go": {
+ "generator_function": "grpc_deps",
+ "generator_name": "io_bazel_rules_go",
+ "name": "io_bazel_rules_go",
+ "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz",
+ "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz"
+ ]
+ },
+ "io_bazel_rules_python": {
+ "generator_function": "grpc_deps",
+ "generator_name": "io_bazel_rules_python",
+ "name": "io_bazel_rules_python",
+ "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161",
+ "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz"
+ },
+ "io_bazel_rules_sass": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "io_bazel_rules_sass",
+ "name": "io_bazel_rules_sass",
+ "sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
+ "strip_prefix": "rules_sass-1.25.0",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
+ "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
+ ]
+ },
+ "io_bazel_skydoc": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "io_bazel_skydoc",
+ "name": "io_bazel_skydoc",
+ "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
+ "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
+ "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
+ ]
+ },
+ "io_opencensus_cpp": {
+ "generator_function": "grpc_deps",
+ "generator_name": "io_opencensus_cpp",
+ "name": "io_opencensus_cpp",
+ "sha256": "90d6fafa8b1a2ea613bf662731d3086e1c2ed286f458a95c81744df2dbae41b1",
+ "strip_prefix": "opencensus-cpp-c9a4da319bc669a772928ffc55af4a61be1a1176",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz",
+ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
+ ]
+ },
+ "java_tools-v11.6.zip": {
+ "name": "java_tools-v11.6.zip",
+ "sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
+ ]
+ },
+ "java_tools_darwin-v11.6.zip": {
+ "name": "java_tools_darwin-v11.6.zip",
+ "sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
+ ]
+ },
+ "java_tools_langtools_javac11": {
+ "name": "java_tools_langtools_javac11",
+ "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
+ ]
+ },
+ "java_tools_linux-v11.6.zip": {
+ "name": "java_tools_linux-v11.6.zip",
+ "sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
+ ]
+ },
+ "java_tools_windows-v11.6.zip": {
+ "name": "java_tools_windows-v11.6.zip",
+ "sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
+ ]
+ },
+ "jekyll_tree_0_17_1": {
+ "name": "jekyll_tree_0_17_1",
+ "sha256": "02256ddd20eeaf70cf8fcfe9b2cdddd7be87aedd5848d549474fb0358e0031d3",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.1.tar"
+ ]
+ },
+ "jekyll_tree_0_17_2": {
+ "name": "jekyll_tree_0_17_2",
+ "sha256": "13b35dd309a0d52f0a2518a1193f42729c75255f5fae40cea68e4d4224bfaa2e",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.17.2.tar"
+ ]
+ },
+ "jekyll_tree_0_18_1": {
+ "name": "jekyll_tree_0_18_1",
+ "sha256": "98b77f48e37a50fc6f83100bf53f661e10732bb3ddbc226e02d0225cb7a9a7d8",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.18.1.tar"
+ ]
+ },
+ "jekyll_tree_0_19_1": {
+ "name": "jekyll_tree_0_19_1",
+ "sha256": "ec892c59ba18bb8de1f9ae2bde937db144e45f28d6d1c32a2cee847ee81b134d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.1.tar"
+ ]
+ },
+ "jekyll_tree_0_19_2": {
+ "name": "jekyll_tree_0_19_2",
+ "sha256": "3c2d9f21ec2fd1c0b8a310f6eb6043027c838810cdfc2457d4346a0e5cdcaa7a",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.19.2.tar"
+ ]
+ },
+ "jekyll_tree_0_20_0": {
+ "name": "jekyll_tree_0_20_0",
+ "sha256": "bb79a63810bf1b0aa1f89bd3bbbeb4a547a30ab9af70c9be656cc6866f4b015b",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.20.0.tar"
+ ]
+ },
+ "jekyll_tree_0_21_0": {
+ "name": "jekyll_tree_0_21_0",
+ "sha256": "23ec39c0138d358c544151e5c81586716d5d1c6124f10a742bead70516e6eb93",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.21.0.tar"
+ ]
+ },
+ "jekyll_tree_0_22_0": {
+ "name": "jekyll_tree_0_22_0",
+ "sha256": "bec5cfaa5560e082e41e33bde276cf93f0f7bcfd2914a3e868f921df8b3ab725",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.22.0.tar"
+ ]
+ },
+ "jekyll_tree_0_23_0": {
+ "name": "jekyll_tree_0_23_0",
+ "sha256": "56c80fcf49dc606fab8ed5e737a7409e9a486585b7b98673be69b5a4984dd774",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.23.0.tar"
+ ]
+ },
+ "jekyll_tree_0_24_0": {
+ "name": "jekyll_tree_0_24_0",
+ "sha256": "988fa567906a73e50d3669909285187ef88c76ecd4aa277f4d1f355fc06a90c8",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.24.0.tar"
+ ]
+ },
+ "jekyll_tree_0_25_0": {
+ "name": "jekyll_tree_0_25_0",
+ "sha256": "e8ab61c047225e808982a564ecd692fd63bd243dccc88a8768ed069a5362a685",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.25.0.tar"
+ ]
+ },
+ "jekyll_tree_0_26_0": {
+ "name": "jekyll_tree_0_26_0",
+ "sha256": "3907dfc6fb27d246e67877e553e8951fac239bb49f2dec7e06b6b09cb0b98b8d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.26.0.tar"
+ ]
+ },
+ "jekyll_tree_0_27_0": {
+ "name": "jekyll_tree_0_27_0",
+ "sha256": "97e2633fefee389daade775da43907aa68699b32212f4e48cb095abe18aa7e65",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.27.0.tar"
+ ]
+ },
+ "jekyll_tree_0_28_0": {
+ "name": "jekyll_tree_0_28_0",
+ "sha256": "64b3fc267fb1f4c56345d96f0ad9f07a2efe43bd15361f818368849cf941b3b7",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.28.0.tar"
+ ]
+ },
+ "jekyll_tree_0_29_0": {
+ "name": "jekyll_tree_0_29_0",
+ "sha256": "99d7a6bf9ef0145c59c54b4319fb31cb855681782080a5490909c4a5463c7215",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.0.tar"
+ ]
+ },
+ "jekyll_tree_0_29_1": {
+ "name": "jekyll_tree_0_29_1",
+ "sha256": "cf0a517f1660a7c4fd26a7ef6f3594bbefcf2b670bc0ed610bf3bb6ec3a9fdc3",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-0.29.1.tar"
+ ]
+ },
+ "jekyll_tree_1_0_0": {
+ "name": "jekyll_tree_1_0_0",
+ "sha256": "61ef65c738a8cd65059f58f2ee5f7eef493136ac4d5e5c3464787d17043febdf",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.0.0.tar"
+ ]
+ },
+ "jekyll_tree_1_1_0": {
+ "name": "jekyll_tree_1_1_0",
+ "sha256": "46d82c9249896903ee6be2295fc52a1346a9ee82f61f89b8a2181232c3bd999b",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.1.0.tar"
+ ]
+ },
+ "jekyll_tree_1_2_0": {
+ "name": "jekyll_tree_1_2_0",
+ "sha256": "d402a8391ca2624673f124ff42ba8d0d40d4139e5d23111f3995dc6c5f70f63d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-1.2.0.tar"
+ ]
+ },
+ "jekyll_tree_2_0_0": {
+ "name": "jekyll_tree_2_0_0",
+ "sha256": "7d7c424ede503856c61b645d8fdc2513ec6ea8600d76c5e87c45a9a45c16de3e",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.0.0.tar"
+ ]
+ },
+ "jekyll_tree_2_1_0": {
+ "name": "jekyll_tree_2_1_0",
+ "sha256": "b0fd257b1d6b1b05705742d55a13b9a20d3e99f49c89334750c872d620e5b88f",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.1.0.tar"
+ ]
+ },
+ "jekyll_tree_2_2_0": {
+ "name": "jekyll_tree_2_2_0",
+ "sha256": "4c1506786ab98df8039ec7354b82da7b586b2ae4ab7f7e7d08f3caf74ff28e3d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-2.2.0.tar"
+ ]
+ },
+ "jekyll_tree_3_0_0": {
+ "name": "jekyll_tree_3_0_0",
+ "sha256": "bd1096ad609c253fa7b1473edf4a3aa51f36243e188dbb62c68d8ed4aca2419d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.0.0.tar"
+ ]
+ },
+ "jekyll_tree_3_1_0": {
+ "name": "jekyll_tree_3_1_0",
+ "sha256": "f9d2e22e24af426d6c9de163d91abe6d8af7eb1eabb1d7ff5e9cf4bededf465a",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.1.0-807b377.tar"
+ ]
+ },
+ "jekyll_tree_3_2_0": {
+ "name": "jekyll_tree_3_2_0",
+ "sha256": "6cff8654e739a0c3062183a5a6cc82fcf9a77323051f8c007866d7f4101052a6",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.2.0.tar"
+ ]
+ },
+ "jekyll_tree_3_3_0": {
+ "name": "jekyll_tree_3_3_0",
+ "sha256": "36b81e8ddf4f3caccf41acc82d9e49f000c1be9e92c9cc82793d60ff70636176",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.3.0.tar"
+ ]
+ },
+ "jekyll_tree_3_4_0": {
+ "name": "jekyll_tree_3_4_0",
+ "sha256": "af82e775d911135bcff76e500bb003c4a9fccb949f8ddf4d93c58eca195bf5e8",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.4.0.tar"
+ ]
+ },
+ "jekyll_tree_3_5_0": {
+ "name": "jekyll_tree_3_5_0",
+ "sha256": "aa96cbad14cfab0b422d1d17eac3107a75eb05854d40ab4f1379a6fc87b2e1f8",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.0.tar"
+ ]
+ },
+ "jekyll_tree_3_5_1": {
+ "name": "jekyll_tree_3_5_1",
+ "sha256": "1c949ba8da353c93c74a70638e5cb321ea1cd5582eda1b6ad88c6d2d0b569f2f",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.5.1.tar"
+ ]
+ },
+ "jekyll_tree_3_6_0": {
+ "name": "jekyll_tree_3_6_0",
+ "sha256": "1b7a16a2098ca0c290c208a11db886e950d6c523b2cac2d0a0cba4a04aa832f3",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.6.0.tar"
+ ]
+ },
+ "jekyll_tree_3_7_0": {
+ "name": "jekyll_tree_3_7_0",
+ "sha256": "a534d37ef3867c92fae8692852f92820a34f63a5f9092bbbec6505c0f69d8094",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar"
+ ]
+ },
+ "jekyll_tree_4_0_0": {
+ "name": "jekyll_tree_4_0_0",
+ "sha256": "9d8e350a17b85624d8d78291d440e05f6ba8af493c1ccb846d0493579dade1b6",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.0.0.tar"
+ ]
+ },
+ "jekyll_tree_4_1_0": {
+ "name": "jekyll_tree_4_1_0",
+ "sha256": "9ed45a322906029d161f5514371841fbec214c63b9517fccb225c8670ebb482a",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.1.0.tar"
+ ]
+ },
+ "jekyll_tree_4_2_0": {
+ "name": "jekyll_tree_4_2_0",
+ "sha256": "1188fc6c3354f85741bacbb2bc7dab6bbfd1d2f44475846293ff232fb01709b8",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.0.tar"
+ ]
+ },
+ "jekyll_tree_4_2_1": {
+ "name": "jekyll_tree_4_2_1",
+ "sha256": "b767b7aa949f96b602257587add3be38acbead03bf919fe871397bc80d97f8b2",
+ "urls": [
+ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.1.tar"
+ ]
+ },
+ "opencensus_proto": {
+ "generator_function": "grpc_deps",
+ "generator_name": "opencensus_proto",
+ "name": "opencensus_proto",
+ "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0",
+ "strip_prefix": "opencensus-proto-0.3.0/src",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz",
+ "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz"
+ ]
+ },
+ "openjdk11_darwin_aarch64_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk11_darwin_aarch64_archive",
+ "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
+ ]
+ },
+ "openjdk11_darwin_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk11_darwin_archive",
+ "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
+ ]
+ },
+ "openjdk11_linux_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk11_linux_archive",
+ "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
+ ]
+ },
+ "openjdk11_windows_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk11_windows_archive",
+ "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
+ ]
+ },
+ "openjdk15_darwin_aarch64_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk15_darwin_aarch64_archive",
+ "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
+ ]
+ },
+ "openjdk15_darwin_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk15_darwin_archive",
+ "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "openjdk15_linux_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk15_linux_archive",
+ "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "openjdk15_windows_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk15_windows_archive",
+ "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
+ ]
+ },
+ "openjdk16_darwin_aarch64_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk16_darwin_aarch64_archive",
+ "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
+ ]
+ },
+ "openjdk16_darwin_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk16_darwin_archive",
+ "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "openjdk16_linux_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk16_linux_archive",
+ "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "openjdk16_windows_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk16_windows_archive",
+ "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
+ ]
+ },
+ "openjdk17_darwin_aarch64_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk17_darwin_aarch64_archive",
+ "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
+ ]
+ },
+ "openjdk17_darwin_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk17_darwin_archive",
+ "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "openjdk17_linux_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk17_linux_archive",
+ "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "openjdk17_windows_archive": {
+ "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
+ "name": "openjdk17_windows_archive",
+ "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
+ ]
+ },
+ "openjdk_linux": {
+ "downloaded_file_path": "zulu-linux.tar.gz",
+ "name": "openjdk_linux",
+ "sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz"
+ ]
+ },
+ "openjdk_linux_aarch64": {
+ "downloaded_file_path": "zulu-linux-aarch64.tar.gz",
+ "name": "openjdk_linux_aarch64",
+ "sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
+ ]
+ },
+ "openjdk_linux_aarch64_minimal": {
+ "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
+ "name": "openjdk_linux_aarch64_minimal",
+ "sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
+ ]
+ },
+ "openjdk_linux_aarch64_vanilla": {
+ "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
+ "name": "openjdk_linux_aarch64_vanilla",
+ "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
+ ]
+ },
+ "openjdk_linux_minimal": {
+ "downloaded_file_path": "zulu-linux-minimal.tar.gz",
+ "name": "openjdk_linux_minimal",
+ "sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
+ ]
+ },
+ "openjdk_linux_ppc64le_vanilla": {
+ "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
+ "name": "openjdk_linux_ppc64le_vanilla",
+ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "openjdk_linux_s390x_vanilla": {
+ "downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
+ "name": "openjdk_linux_s390x_vanilla",
+ "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
+ "urls": [
+ "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "openjdk_linux_vanilla": {
+ "downloaded_file_path": "zulu-linux-vanilla.tar.gz",
+ "name": "openjdk_linux_vanilla",
+ "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
+ ]
+ },
+ "openjdk_macos_aarch64": {
+ "downloaded_file_path": "zulu-macos-aarch64.tar.gz",
+ "name": "openjdk_macos_aarch64",
+ "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz"
+ ]
+ },
+ "openjdk_macos_aarch64_minimal": {
+ "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz",
+ "name": "openjdk_macos_aarch64_minimal",
+ "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz"
+ ]
+ },
+ "openjdk_macos_aarch64_vanilla": {
+ "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz",
+ "name": "openjdk_macos_aarch64_vanilla",
+ "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"
+ ]
+ },
+ "openjdk_macos_x86_64": {
+ "downloaded_file_path": "zulu-macos.tar.gz",
+ "name": "openjdk_macos_x86_64",
+ "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"
+ ]
+ },
+ "openjdk_macos_x86_64_minimal": {
+ "downloaded_file_path": "zulu-macos-minimal.tar.gz",
+ "name": "openjdk_macos_x86_64_minimal",
+ "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"
+ ]
+ },
+ "openjdk_macos_x86_64_vanilla": {
+ "downloaded_file_path": "zulu-macos-vanilla.tar.gz",
+ "name": "openjdk_macos_x86_64_vanilla",
+ "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
+ ]
+ },
+ "openjdk_win": {
+ "downloaded_file_path": "zulu-win.zip",
+ "name": "openjdk_win",
+ "sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
+ ]
+ },
+ "openjdk_win_minimal": {
+ "downloaded_file_path": "zulu-win-minimal.zip",
+ "name": "openjdk_win_minimal",
+ "sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
+ ]
+ },
+ "openjdk_win_vanilla": {
+ "downloaded_file_path": "zulu-win-vanilla.zip",
+ "name": "openjdk_win_vanilla",
+ "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
+ ]
+ },
+ "org_snakeyaml": {
+ "build_file_content": "\njava_library(\n name = \"snakeyaml\",\n testonly = True,\n srcs = glob([\"src/main/**/*.java\"]),\n visibility = [\"@com_google_testparameterinjector//:__pkg__\"],\n)\n",
+ "name": "org_snakeyaml",
+ "sha256": "fd0e0cc6c5974fc8f08be3a15fb4a59954c7dd958b5b68186a803de6420b6e40",
+ "strip_prefix": "asomov-snakeyaml-b28f0b4d87c6",
+ "urls": [
+ "https://mirror.bazel.build/bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz"
+ ]
+ },
+ "platforms": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "platforms",
+ "name": "platforms",
+ "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz",
+ "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz"
+ ]
+ },
+ "platforms-0.0.4.tar.gz": {
+ "name": "platforms-0.0.4.tar.gz",
+ "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz",
+ "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz"
+ ]
+ },
+ "remote_coverage_tools": {
+ "name": "remote_coverage_tools",
+ "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
+ "urls": [
+ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
+ ]
+ },
+ "remote_java_tools_darwin": {
+ "generator_function": "maybe",
+ "generator_name": "remote_java_tools_darwin",
+ "name": "remote_java_tools_darwin",
+ "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip"
+ ]
+ },
+ "remote_java_tools_darwin_for_testing": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_darwin_for_testing",
+ "name": "remote_java_tools_darwin_for_testing",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_for_testing": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_for_testing",
+ "name": "remote_java_tools_for_testing",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_linux": {
+ "generator_function": "maybe",
+ "generator_name": "remote_java_tools_linux",
+ "name": "remote_java_tools_linux",
+ "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip"
+ ]
+ },
+ "remote_java_tools_linux_for_testing": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_linux_for_testing",
+ "name": "remote_java_tools_linux_for_testing",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_test": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_test",
+ "name": "remote_java_tools_test",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "a7ac5922ee01e8b8fcb546ffc264ef314d0a0c679328b7fa4c432e5f54a86067",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_test_darwin": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_test_darwin",
+ "name": "remote_java_tools_test_darwin",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "f17ee54582b61f1ebd84c8fa2c54df796914cfbaac3cb821fb1286b55b080bc0",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_darwin-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_darwin-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_test_linux": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_test_linux",
+ "name": "remote_java_tools_test_linux",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "15da4f84a7d39cd179acf3035d9def638eea6ba89a0ed8f4e8a8e6e1d6c8e328",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_linux-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_linux-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_test_windows": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_test_windows",
+ "name": "remote_java_tools_test_windows",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
+ ]
+ },
+ "remote_java_tools_windows": {
+ "generator_function": "maybe",
+ "generator_name": "remote_java_tools_windows",
+ "name": "remote_java_tools_windows",
+ "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip"
+ ]
+ },
+ "remote_java_tools_windows_for_testing": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "remote_java_tools_windows_for_testing",
+ "name": "remote_java_tools_windows_for_testing",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "939f9d91f0df02851bbad8f5b1d26d24011329394cafe5668c1234e31ac2a1f7",
+ "urls": [
+ "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.6/java_tools_windows-v11.6.zip",
+ "https://github.com/bazelbuild/java_tools/releases/download/java_v11.6/java_tools_windows-v11.6.zip"
+ ]
+ },
+ "remotejdk11_linux": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_linux",
+ "name": "remotejdk11_linux",
+ "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
+ "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_aarch64": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_linux_aarch64",
+ "name": "remotejdk11_linux_aarch64",
+ "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
+ "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_aarch64_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_aarch64_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_ppc64le": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_linux_ppc64le",
+ "name": "remotejdk11_linux_ppc64le",
+ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_ppc64le_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_ppc64le_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_s390x": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_linux_s390x",
+ "name": "remotejdk11_linux_s390x",
+ "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "remotejdk11_linux_s390x_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_linux_s390x_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
+ "strip_prefix": "jdk-11.0.7+10",
+ "urls": [
+ "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
+ "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
+ ]
+ },
+ "remotejdk11_macos": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_macos",
+ "name": "remotejdk11_macos",
+ "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
+ "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk11_macos_aarch64": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_macos_aarch64",
+ "name": "remotejdk11_macos_aarch64",
+ "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
+ "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk11_macos_aarch64_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_macos_aarch64_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk11_macos_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_macos_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk11_win": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk11_win",
+ "name": "remotejdk11_win",
+ "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
+ "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
+ ]
+ },
+ "remotejdk11_win_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk11_win_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
+ "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
+ ]
+ },
+ "remotejdk14_linux": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk14_linux",
+ "name": "remotejdk14_linux",
+ "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk14_macos": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk14_macos",
+ "name": "remotejdk14_macos",
+ "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk14_win": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk14_win",
+ "name": "remotejdk14_win",
+ "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
+ "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
+ ]
+ },
+ "remotejdk15_linux": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk15_linux",
+ "name": "remotejdk15_linux",
+ "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk15_linux_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk15_linux_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk15_macos": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk15_macos",
+ "name": "remotejdk15_macos",
+ "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk15_macos_aarch64": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk15_macos_aarch64",
+ "name": "remotejdk15_macos_aarch64",
+ "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk15_macos_aarch64_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk15_macos_aarch64_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",
+ "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk15_macos_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk15_macos_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk15_win": {
+ "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",
+ "generator_function": "maybe",
+ "generator_name": "remotejdk15_win",
+ "name": "remotejdk15_win",
+ "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
+ ]
+ },
+ "remotejdk15_win_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk15_win_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",
+ "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"
+ ]
+ },
+ "remotejdk16_linux_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk16_linux_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk16_macos_aarch64_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk16_macos_aarch64_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk16_macos_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk16_macos_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk16_win_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk16_win_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4",
+ "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip"
+ ]
+ },
+ "remotejdk17_linux_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk17_linux_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz"
+ ]
+ },
+ "remotejdk17_macos_aarch64_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk17_macos_aarch64_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz"
+ ]
+ },
+ "remotejdk17_macos_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk17_macos_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
+ ]
+ },
+ "remotejdk17_win_for_testing": {
+ "build_file": "@local_jdk//:BUILD.bazel",
+ "name": "remotejdk17_win_for_testing",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3",
+ "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64",
+ "urls": [
+ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip",
+ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
+ ]
+ },
+ "rules_cc": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "rules_cc",
+ "name": "rules_cc",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
+ "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
+ "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
+ ]
+ },
+ "rules_java": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "rules_java",
+ "name": "rules_java",
+ "patch_cmds": [
+ "test -f BUILD && chmod u+w BUILD || true",
+ "echo >> BUILD",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+ "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+ ]
+ },
+ "rules_nodejs-2.2.2.tar.gz": {
+ "name": "rules_nodejs-2.2.2.tar.gz",
+ "sha256": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
+ "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz"
+ ]
+ },
+ "rules_pkg": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "rules_pkg",
+ "name": "rules_pkg",
+ "sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+ "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz"
+ ]
+ },
+ "rules_pkg-0.4.0.tar.gz": {
+ "name": "rules_pkg-0.4.0.tar.gz",
+ "sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+ "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz"
+ ]
+ },
+ "rules_proto": {
+ "generator_function": "dist_http_archive",
+ "generator_name": "rules_proto",
+ "name": "rules_proto",
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da",
+ "strip_prefix": "rules_proto-7e4afce6fe62dbff0a4a03450143146f9f2d7488",
+ "urls": [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz",
+ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
+ ]
+ },
+ "six": {
+ "build_file": "@com_github_grpc_grpc//third_party:six.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "six",
+ "name": "six",
+ "sha256": "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+ "urls": [
+ "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz"
+ ]
+ },
+ "upb": {
+ "generator_function": "grpc_deps",
+ "generator_name": "upb",
+ "name": "upb",
+ "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
+ "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz"
+ ]
+ },
+ "v1.41.0.tar.gz": {
+ "name": "v1.41.0.tar.gz",
+ "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656",
+ "urls": [
+ "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz",
+ "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz"
+ ]
+ },
+ "v1.5.0-4.zip": {
+ "name": "v1.5.0-4.zip",
+ "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4",
+ "urls": [
+ "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip",
+ "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip"
+ ]
+ },
+ "v3.13.0.tar.gz": {
+ "name": "v3.13.0.tar.gz",
+ "sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
+ "urls": [
+ "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+ "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
+ ]
+ },
+ "zlib": {
+ "build_file": "@com_github_grpc_grpc//third_party:zlib.BUILD",
+ "generator_function": "grpc_deps",
+ "generator_name": "zlib",
+ "name": "zlib",
+ "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45",
+ "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f",
+ "urls": [
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz",
+ "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz"
+ ]
+ },
+ "zstd-jni": {
+ "build_file": "//third_party:zstd-jni/zstd-jni.BUILD",
+ "generator_function": "dist_http_archive",
+ "generator_name": "zstd-jni",
+ "name": "zstd-jni",
+ "patch_args": [
+ "-p1"
+ ],
+ "patch_cmds": [
+ "test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
+ "echo >> BUILD.bazel",
+ "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
+ ],
+ "patch_cmds_win": [
+ "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
+ ],
+ "patches": [
+ "//third_party:zstd-jni/Native.java.patch"
+ ],
+ "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4",
+ "strip_prefix": "zstd-jni-1.5.0-4",
+ "urls": [
+ "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip",
+ "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip"
+ ]
+ },
+ "zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz": {
+ "name": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz",
+ "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz"
+ ]
+ },
+ "zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz": {
+ "name": "zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz",
+ "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz"
+ ]
+ },
+ "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz": {
+ "name": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz",
+ "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz"
+ ]
+ },
+ "zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz": {
+ "name": "zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz",
+ "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz"
+ ]
+ },
+ "zulu11.50.19-ca-jdk11.0.12-win_x64.tar.gz": {
+ "name": "zulu11.50.19-ca-jdk11.0.12-win_x64.tar.gz",
+ "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015",
+ "urls": [
+ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
+ ]
+ }
+}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py
new file mode 100755
index 000000000000..d409a32e1389
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/update-srcDeps.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+import sys
+import json
+
+if len(sys.argv) != 2:
+ print("usage: ./this-script src-deps.json < WORKSPACE", file=sys.stderr)
+ print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)
+ print("Hail Eris.", file=sys.stderr)
+ sys.exit(1)
+
+http_archives = []
+
+# just the kw args are the dict { name, sha256, urls … }
+def http_archive(**kw):
+ http_archives.append(kw)
+# like http_file
+def http_file(**kw):
+ http_archives.append(kw)
+
+# this is inverted from http_archive/http_file and bundles multiple archives
+def _distdir_tar(**kw):
+ for archive_name in kw['archives']:
+ http_archives.append({
+ "name": archive_name,
+ "sha256": kw['sha256'][archive_name],
+ "urls": kw['urls'][archive_name]
+ })
+
+# TODO?
+def git_repository(**kw):
+ print(json.dumps(kw, sort_keys=True, indent=4), file=sys.stderr)
+ sys.exit(1)
+
+# execute the WORKSPACE like it was python code in this module,
+# using all the function stubs from above.
+exec(sys.stdin.read())
+
+# transform to a dict with the names as keys
+d = { el['name']: el for el in http_archives }
+
+def has_urls(el):
+ return ('url' in el and el['url']) or ('urls' in el and el['urls'])
+def has_sha256(el):
+ return 'sha256' in el and el['sha256']
+bad_archives = list(filter(lambda el: not has_urls(el) or not has_sha256(el), d.values()))
+if bad_archives:
+ print('Following bazel dependencies are missing url or sha256', file=sys.stderr)
+ print('Check bazel sources for master or non-checksummed dependencies', file=sys.stderr)
+ for el in bad_archives:
+ print(json.dumps(el, sort_keys=True, indent=4), file=sys.stderr)
+ sys.exit(1)
+
+with open(sys.argv[1], "w") as f:
+ print(json.dumps(d, sort_keys=True, indent=4), file=f)
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index 9641a95c33b8..cfdfe84f79d3 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -5,6 +5,7 @@
, gccStdenv
, lib
, openjdk8
+, jdk11_headless
, runLocal
, runtimeShell
, writeScript
@@ -41,18 +42,19 @@ let
name = "bazel-test-java";
inherit workspaceDir;
bazelPkg = bazel;
- buildInputs = [ openjdk8 ];
+ buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];
bazelScript = ''
${bazel}/bin/bazel \
run \
--distdir=${distDir} \
- --host_javabase='@local_jdk//:jdk' \
- --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
- --javabase='@local_jdk//:jdk' \
--verbose_failures \
--curses=no \
--sandbox_debug \
- //:ProjectRunner
+ //:ProjectRunner \
+ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
+ --host_javabase='@local_jdk//:jdk' \
+ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+ --javabase='@local_jdk//:jdk' \
'';
};
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index d01e18887248..f4872d1b1204 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -6,6 +6,7 @@
, gccStdenv
, lib
, openjdk8
+, jdk11_headless
, runLocal
, runtimeShell
, writeScript
@@ -160,18 +161,19 @@ let
name = "bazel-test-protocol-buffers";
inherit workspaceDir;
bazelPkg = bazel;
- buildInputs = [ openjdk8 ];
+ buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];
bazelScript = ''
${bazel}/bin/bazel \
build \
--distdir=${distDir} \
- --host_javabase='@local_jdk//:jdk' \
- --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
- --javabase='@local_jdk//:jdk' \
--verbose_failures \
--curses=no \
--sandbox_debug \
- //...
+ //... \
+ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
+ --host_javabase='@local_jdk//:jdk' \
+ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+ --javabase='@local_jdk//:jdk' \
'';
};
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
deleted file mode 100644
index ec03e285603f..000000000000
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
-}:
-
-with lib;
-
-assert stdenv ? cc;
-assert stdenv.cc ? libc;
-
-let
- os = lib.optionalString;
- majorVersion = "2.8";
- minorVersion = "12.2";
- version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
- pname = "cmake${os useNcurses "-cursesUI"}${os useQt4 "-qt4UI"}";
- inherit version;
-
- inherit majorVersion;
-
- src = fetchurl {
- url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
- sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
- };
-
- enableParallelBuilding = true;
-
- patches =
- [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959
- name = "FindFreetype-2.5.patch";
- url = "https://public.kitware.com/Bug/file/4660/0001-Support-finding-freetype2-using-pkg-config.patch";
- sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
- })] ++
- # Don't search in non-Nix locations such as /usr, but do search in our libc.
- [ ./search-path-2.8.patch ] ++
- optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchurl {
- name = "fix-darwin-cross-compile.patch";
- url = "https://public.kitware.com/Bug/file_download.php?"
- + "file_id=4981&type=bug";
- sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
- });
-
- postPatch = ''
- substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \
- --replace '"-framework CoreServices"' '""'
- '';
-
- buildInputs = [ setupHook curl expat zlib bzip2 ]
- ++ optional useNcurses ncurses
- ++ optional useQt4 qt4;
-
- propagatedBuildInputs = [ ps ];
-
- CMAKE_PREFIX_PATH = concatStringsSep ":"
- (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs);
-
- configureFlags = [
- "--docdir=/share/doc/${pname}-${version}"
- "--mandir=/share/man"
- "--system-libs"
- "--no-system-libarchive"
- ] ++ lib.optional useQt4 "--qt-gui";
-
- setupHook = ./setup-hook.sh;
-
- dontUseCmakeConfigure = true;
-
- preConfigure = with stdenv; ''
- fixCmakeFiles .
- substituteInPlace Modules/Platform/UnixPaths.cmake \
- --subst-var-by libc_bin ${getBin cc.libc} \
- --subst-var-by libc_dev ${getDev cc.libc} \
- --subst-var-by libc_lib ${getLib cc.libc}
- configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
- '';
-
- hardeningDisable = [ "format" ];
-
- meta = {
- homepage = "https://cmake.org";
- description = "Cross-Platform Makefile Generator";
- platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix;
- maintainers = with lib.maintainers; [ xfix ];
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch b/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
deleted file mode 100644
index 9fc949661686..000000000000
--- a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake
---- cmake-2.8.12.2/Modules/Platform/Linux.cmake 2014-01-16 21:15:08.000000000 +0400
-+++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake 2016-04-13 22:00:32.928575740 +0300
-@@ -36,22 +36,11 @@
- # checking the platform every time. This option is advanced enough
- # that only package maintainers should need to adjust it. They are
- # capable of providing a setting on the command line.
-- if(EXISTS "/etc/debian_version")
-- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
-- "Install .so files without execute permission.")
-- else()
-- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-- "Install .so files without execute permission.")
-- endif()
-+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-+ "Install .so files without execute permission.")
- endif()
-
- # Match multiarch library directory names.
- set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
-
- include(Platform/UnixPaths)
--
--# Debian has lib64 paths only for compatibility so they should not be
--# searched.
--if(EXISTS "/etc/debian_version")
-- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--endif()
-diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake 2014-01-16 21:15:08.000000000 +0400
-+++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:09:10.106362636 +0300
-@@ -32,9 +32,6 @@
- # List common installation prefixes. These will be used for all
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-- # Standard
-- /usr/local /usr /
--
- # CMake install location
- "${_CMAKE_INSTALL_DIR}"
-
-@@ -44,44 +41,26 @@
-
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /usr/pkg/include
-- /opt/csw/include /opt/include
-- /usr/openwin/include
-+ @libc_dev@/include
- )
-
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-- # Windows API on Cygwin
-- /usr/lib/w32api
--
-- # X11
-- /usr/X11R6/lib /usr/lib/X11
--
-- # Other
-- /usr/pkg/lib
-- /opt/csw/lib /opt/lib
-- /usr/openwin/lib
-+ @libc_lib@/lib
- )
-
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @libc_bin@/bin
- )
-
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-- /lib /usr/lib /usr/lib32 /usr/lib64
-+ @libc_lib@/lib
- )
-
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-- /usr/include
-+ @libc_dev@/include
- )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-- /usr/include
-+ @libc_dev@/include
- )
-
- # Enable use of lib64 search path variants by default.
diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix
index 0a0eb41d6131..5bd02fb27dfb 100644
--- a/pkgs/development/tools/go-swag/default.nix
+++ b/pkgs/development/tools/go-swag/default.nix
@@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "swaggo";
repo = "swag";
- rev = "df209afeed2334a97c83aff34ea7abcad85c31f6";
+ rev = "v${version}";
sha256 = "17pmcfkcmgjvs4drs0fyhp2m39gw83s0ck3rdzdkgdhrbhva9ksx";
};
diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix
index f88fcd9f4290..0163b616f14b 100644
--- a/pkgs/development/tools/metal-cli/default.nix
+++ b/pkgs/development/tools/metal-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "metal-cli";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "equinix";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Zl0OuyqF+bNsp1AqnS8jhQlY7l4U6OjHHgth7pRPwEc=";
+ sha256 = "sha256-Ekwucff12FIjaZ8qDvonhTdz7+DRpPLMGz2yqaCy+Bc=";
};
vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE=";
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index 988f76792273..fe20047713b6 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -1,9 +1,9 @@
{
- "url": "https://github.com/nvim-treesitter/tree-sitter-lua",
- "rev": "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6",
- "date": "2021-08-02T15:13:28+02:00",
- "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua",
- "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d",
+ "url": "https://github.com/MunifTanjim/tree-sitter-lua",
+ "rev": "2e372ad0af8c6a68ba39f107a2edc9e3fc19ecf1",
+ "date": "2022-01-21T16:10:07+06:00",
+ "path": "/nix/store/6gpfn7bvv92b6rjw40kpmgvvvzb07j26-tree-sitter-lua",
+ "sha256": "1vyjix2vsrxkcwm0hbcc5i81c0a552mg7x639m6zxr6wh0ca4nsm",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index c0a5812d7e88..eae6dd081355 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -105,7 +105,7 @@ let
repo = "tree-sitter-latex";
};
"tree-sitter-lua" = {
- orga = "nvim-treesitter";
+ orga = "MunifTanjim";
repo = "tree-sitter-lua";
};
"tree-sitter-fennel" = {
diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix
index c1a069d36f2d..1209f371a42f 100644
--- a/pkgs/development/tools/tabnine/default.nix
+++ b/pkgs/development/tools/tabnine/default.nix
@@ -1,17 +1,19 @@
{ stdenv, lib, fetchurl, unzip }:
let
+ # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
+ version = "4.0.60";
supportedPlatforms = {
"x86_64-linux" = {
name = "x86_64-unknown-linux-musl";
- sha256 = "sha256-On+Sokm2+BV3JbIwK8oPO6882FOWBlgSaAp3VAyR+RM=";
+ sha256 = "sha256-v5UxRMDDQxpqIKMe9mYMXcpWiacdXzFfaQ6bgab/WmQ=";
};
"x86_64-darwin" = {
name = "x86_64-apple-darwin";
- sha256 = "sha256-4YCm42mVcsEvY4I5MWrnbfgUIU7KUIrEirvjN8ISIr0=";
+ sha256 = "sha256-vFMMzMatuu1TY6dnBXycv0HxvkOj4Axfx8p0VW0hOic=";
};
"aarch64-darwin" = {
name = "aarch64-apple-darwin";
- sha256 = "sha256-HN4o5bGX389eAR7ea5EY1JlId8q4lSPGJ4cZo9c2aP4=";
+ sha256 = "sha256-DUeDQLtvSY7W2nG60UunluCSO0ijJP2CYxpRIZA4LTE=";
};
};
platform =
@@ -20,10 +22,9 @@ let
else
throw "Not supported on ${stdenv.hostPlatform.system}";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tabnine";
- # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
- version = "3.7.25";
+ inherit version;
src = fetchurl {
url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip";
@@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
homepage = "https://tabnine.com";
description = "Smart Compose for code that uses deep learning to help you write code faster";
license = licenses.unfree;
- platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" ];
+ platforms = attrNames supportedPlatforms;
maintainers = with maintainers; [ lovesegfault ];
};
}
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 7bef336a5f3e..fb1eec870b78 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
description = "Command line tools for fly.io services";
homepage = "https://fly.io/";
license = licenses.asl20;
- maintainers = with maintainers; [ aaronjanse ];
+ maintainers = with maintainers; [ aaronjanse jsierles ];
};
}
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 42198a65f701..fc5336231465 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minify";
- version = "2.9.24";
+ version = "2.9.29";
src = fetchFromGitHub {
owner = "tdewolff";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4M7Oj/hHFH2OUz0y64GIEnv0Kk0+zAje3kHA2e4RQS0=";
+ sha256 = "sha256-lPw0ndxffBQNsJStrZ9gaGZg+EJcGT9b6xTAc7eX6c8=";
};
- vendorSha256 = "sha256-oYZZ9DzpY544QTWDGz/wkHA9aP0riEXLUTWvzV1KxQc=";
+ vendorSha256 = "sha256-4aoDQKMhczy1u4Eq567aMrFVIBW2L8OgNCqsgmUN6CI=";
doCheck = false;
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 307003025ccc..111d5cf04895 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -664,8 +664,8 @@ let
mktplcRef = {
name = "elm-ls-vscode";
publisher = "Elmtooling";
- version = "2.0.1";
- sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43";
+ version = "2.4.0";
+ sha256 = "sha256-5hYlkx8hlwS8iWTlfupX8XjTLAY/KUi0bd3jf/tm92o=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog";
diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
deleted file mode 100644
index 00c23c6cac14..000000000000
--- a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: pkg-ipsec-tools/src/racoon/gssapi.c
-===================================================================
---- pkg-ipsec-tools.orig/src/racoon/gssapi.c
-+++ pkg-ipsec-tools/src/racoon/gssapi.c
-@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
- gss_name_t princ, canon_princ;
- OM_uint32 maj_stat, min_stat;
-
-+ if (iph1->rmconf == NULL) {
-+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
-+ return -1;
-+ }
-+
- gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
- if (gps == NULL) {
- plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
deleted file mode 100644
index b644d46f8c9d..000000000000
--- a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From: Antoine_Beaupre
-Acked-by: Jiri Bohac
-Subject: PR/51682: Avoid DoS with fragment out of order insertion; keep fragments sorted in the list.
-References: bsc#1047443, CVE-2016-10396
-
-
-
-Index: a/src/racoon/handler.h
-===================================================================
---- a/src/racoon/handler.h.orig 2018-01-26 18:05:21.114764376 +0100
-+++ a/src/racoon/handler.h 2018-01-26 18:05:33.986741103 +0100
-@@ -141,6 +141,7 @@ struct ph1handle {
- #endif
- #ifdef ENABLE_FRAG
- int frag; /* IKE phase 1 fragmentation */
-+ int frag_last_index;
- struct isakmp_frag_item *frag_chain; /* Received fragments */
- #endif
-
-Index: a/src/racoon/isakmp.c
-===================================================================
---- a/src/racoon/isakmp.c.orig 2018-01-26 18:05:21.118764369 +0100
-+++ a/src/racoon/isakmp.c 2018-01-26 18:05:33.986741103 +0100
-@@ -1069,6 +1069,7 @@ isakmp_ph1begin_i(rmconf, remote, local)
- iph1->frag = 1;
- else
- iph1->frag = 0;
-+ iph1->frag_last_index = 0;
- iph1->frag_chain = NULL;
- #endif
- iph1->approval = NULL;
-@@ -1173,6 +1174,7 @@ isakmp_ph1begin_r(msg, remote, local, et
- #endif
- #ifdef ENABLE_FRAG
- iph1->frag = 0;
-+ iph1->frag_last_index = 0;
- iph1->frag_chain = NULL;
- #endif
- iph1->approval = NULL;
-Index: a/src/racoon/isakmp_frag.c
-===================================================================
---- a/src/racoon/isakmp_frag.c.orig 2018-01-26 18:05:21.118764369 +0100
-+++ a/src/racoon/isakmp_frag.c 2018-01-26 18:05:33.986741103 +0100
-@@ -173,6 +173,43 @@ vendorid_frag_cap(gen)
- return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]);
- }
-
-+static int
-+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item)
-+{
-+ struct isakmp_frag_item *pitem = NULL;
-+ struct isakmp_frag_item *citem = iph1->frag_chain;
-+
-+ /* no frag yet, just insert at beginning of list */
-+ if (iph1->frag_chain == NULL) {
-+ iph1->frag_chain = item;
-+ return 0;
-+ }
-+
-+ do {
-+ /* duplicate fragment number, abort (CVE-2016-10396) */
-+ if (citem->frag_num == item->frag_num)
-+ return -1;
-+
-+ /* need to insert before current item */
-+ if (citem->frag_num > item->frag_num) {
-+ if (pitem != NULL)
-+ pitem->frag_next = item;
-+ else
-+ /* insert at the beginning of the list */
-+ iph1->frag_chain = item;
-+ item->frag_next = citem;
-+ return 0;
-+ }
-+
-+ pitem = citem;
-+ citem = citem->frag_next;
-+ } while (citem != NULL);
-+
-+ /* we reached the end of the list, insert */
-+ pitem->frag_next = item;
-+ return 0;
-+}
-+
- int
- isakmp_frag_extract(iph1, msg)
- struct ph1handle *iph1;
-@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg)
- item->frag_next = NULL;
- item->frag_packet = buf;
-
-- /* Look for the last frag while inserting the new item in the chain */
-- if (item->frag_last)
-- last_frag = item->frag_num;
-+ /* Check for the last frag before inserting the new item in the chain */
-+ if (item->frag_last) {
-+ /* if we have the last fragment, indices must match */
-+ if (iph1->frag_last_index != 0 &&
-+ item->frag_last != iph1->frag_last_index) {
-+ plog(LLV_ERROR, LOCATION, NULL,
-+ "Repeated last fragment index mismatch\n");
-+ racoon_free(item);
-+ vfree(buf);
-+ return -1;
-+ }
-
-- if (iph1->frag_chain == NULL) {
-- iph1->frag_chain = item;
-- } else {
-- struct isakmp_frag_item *current;
-+ last_frag = iph1->frag_last_index = item->frag_num;
-+ }
-
-- current = iph1->frag_chain;
-- while (current->frag_next) {
-- if (current->frag_last)
-- last_frag = item->frag_num;
-- current = current->frag_next;
-- }
-- current->frag_next = item;
-+ /* insert fragment into chain */
-+ if (isakmp_frag_insert(iph1, item) == -1) {
-+ plog(LLV_ERROR, LOCATION, NULL,
-+ "Repeated fragment index mismatch\n");
-+ racoon_free(item);
-+ vfree(buf);
-+ return -1;
- }
-
-- /* If we saw the last frag, check if the chain is complete */
-+ /* If we saw the last frag, check if the chain is complete
-+ * we have a sorted list now, so just walk through */
- if (last_frag != 0) {
-+ item = iph1->frag_chain;
- for (i = 1; i <= last_frag; i++) {
-- item = iph1->frag_chain;
-- do {
-- if (item->frag_num == i)
-- break;
-- item = item->frag_next;
-- } while (item != NULL);
--
-+ if (item->frag_num != i)
-+ break;
-+ item = item->frag_next;
- if (item == NULL) /* Not found */
- break;
- }
-
-- if (item != NULL) /* It is complete */
-+ if (i > last_frag) /* It is complete */
- return 1;
- }
-
-@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1)
- }
- data = buf->v;
-
-+ item = iph1->frag_chain;
- for (i = 1; i <= frag_count; i++) {
-- item = iph1->frag_chain;
-- do {
-- if (item->frag_num == i)
-- break;
-- item = item->frag_next;
-- } while (item != NULL);
--
-- if (item == NULL) {
-+ if (item->frag_num != i) {
- plog(LLV_ERROR, LOCATION, NULL,
- "Missing fragment #%d\n", i);
- vfree(buf);
-@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1)
- }
- memcpy(data, item->frag_packet->v, item->frag_packet->l);
- data += item->frag_packet->l;
-+ item = item->frag_next;
- }
-
- out:
-
-
-diff -u -p -r1.50 -r1.51
---- a/src/racoon/isakmp_inf.c 2013/04/12 09:53:10 1.50
-+++ a/src/racoon/isakmp_inf.c 2017/01/24 19:23:56 1.51
-@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca
- #endif
- #ifdef ENABLE_FRAG
- iph1->frag = 0;
-+ iph1->frag_last_index = 0;
- iph1->frag_chain = NULL;
- #endif
-
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
deleted file mode 100644
index f10364121a46..000000000000
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }:
-
-# TODO: These tools are supposed to work under NetBSD and FreeBSD as
-# well, so I guess it's not appropriate to place this expression in
-# "os-specific/linux/ipsec-tools". Since I cannot verify that the
-# expression actually builds on those platforms, I'll leave it here for
-# the time being.
-
-stdenv.mkDerivation rec {
- pname = "ipsec-tools";
- version = "0.8.2";
-
- src = fetchurl {
- url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2";
- sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf";
- };
-
- buildInputs = [ readline openssl flex libkrb5 pam ];
-
- patches = [
- ./dont-create-localstatedir-during-install.patch
- ./CVE-2015-4047.patch
- ./CVE-2016-10396.patch
- ];
-
- # fix build with newer gcc versions
- preConfigure = ''substituteInPlace configure --replace "-Werror" "" '';
-
- configureFlags = [
- "--sysconfdir=/etc --localstatedir=/var"
- "--with-kernel-headers=${linuxHeaders}/include"
- "--disable-security-context"
- "--enable-adminport"
- "--enable-dpd"
- "--enable-frag"
- "--enable-gssapi"
- "--enable-hybrid"
- "--enable-natt"
- "--enable-shared"
- "--enable-stats"
- ];
-
- meta = with lib; {
- homepage = "http://ipsec-tools.sourceforge.net/";
- description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation";
- license = licenses.bsd3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
deleted file mode 100644
index 16b80c36d6a5..000000000000
--- a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ubr ipsec-tools-0.8.0-orig/src/racoon/Makefile.in ipsec-tools-0.8.0/src/racoon/Makefile.in
---- ipsec-tools-0.8.0-orig/src/racoon/Makefile.in 2012-10-20 13:01:07.700903316 +0200
-+++ ipsec-tools-0.8.0/src/racoon/Makefile.in 2012-10-20 13:01:13.177832616 +0200
-@@ -1085,9 +1085,6 @@
- uninstall-sbinPROGRAMS
-
-
--install-exec-local:
-- ${mkinstalldirs} $(DESTDIR)${adminsockdir}
--
- # special object rules
- crypto_openssl_test.o: crypto_openssl.c
- $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 9d90c0cf02b3..43bc291ede2f 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -22,31 +22,31 @@
"5.10": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.92-hardened1.patch",
- "sha256": "08vhk7vzwd9r76mphyphc5n718kdpg3l2i0smrr92w5mx19pvs8g",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.92-hardened1/linux-hardened-5.10.92-hardened1.patch"
+ "name": "linux-hardened-5.10.93-hardened1.patch",
+ "sha256": "0ka3vnd1pwdjkz10hpn4jpxbg6s00kf5jj47847vhbi7fmbgvbg5",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.93-hardened1/linux-hardened-5.10.93-hardened1.patch"
},
- "sha256": "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm",
- "version": "5.10.92"
+ "sha256": "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56",
+ "version": "5.10.93"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.15.15-hardened1.patch",
- "sha256": "0js9fz2xx8gshxb5dc6ycmgycmcfqpxdkbpbmx92d397qdnj0460",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.15-hardened1/linux-hardened-5.15.15-hardened1.patch"
+ "name": "linux-hardened-5.15.16-hardened1.patch",
+ "sha256": "0a8cdxw2s0jr39j072pn7xr5j8zfdmrbsfl5rbvcjqrfnj4ijc15",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.16-hardened1/linux-hardened-5.15.16-hardened1.patch"
},
- "sha256": "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x",
- "version": "5.15.15"
+ "sha256": "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms",
+ "version": "5.15.16"
},
"5.4": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.172-hardened1.patch",
- "sha256": "124l2b3km1278dc4lgm35f50jfxnbdia1127j27w3b3dhs37baw9",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.172-hardened1/linux-hardened-5.4.172-hardened1.patch"
+ "name": "linux-hardened-5.4.173-hardened1.patch",
+ "sha256": "1zpczgxyh76lazsjgf7n1872aayaxg660x6phyr6db667wa8x3r4",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.173-hardened1/linux-hardened-5.4.173-hardened1.patch"
},
- "sha256": "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi",
- "version": "5.4.172"
+ "sha256": "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r",
+ "version": "5.4.173"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index 02e3902d3c5c..0d56108f2f23 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
- version = "5.14.18";
- suffix = "lqx1";
+ version = "5.15.16";
+ suffix = "lqx2";
in
buildLinux (args // {
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "sha256-jn2Y/zusxwOvT5MXlM5HCojiyY0ssC36O92iv7/ZMWU=";
+ sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg=";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index ec83b472085d..3b4ed64bda07 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -17,7 +17,7 @@
}@args:
{ lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl
-, kernel ? null, perl, nukeReferences
+, kernel ? null, perl, nukeReferences, which
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
@@ -93,6 +93,7 @@ let
libPath = libPathFor pkgs;
libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux);
+ buildInputs = [ which ];
nativeBuildInputs = [ perl nukeReferences ]
++ optionals (!libsOnly) kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 4860dd9a9347..a15e882deaef 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, pkgs }:
+{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }:
let
@@ -33,6 +33,29 @@ in
inputs = [ pkgs.openssl ];
};
+ auth-a2aclr = {
+ src = fetchFromGitLab {
+ name = "auth-a2aclr";
+ owner = "arpa2";
+ repo = "nginx-auth-a2aclr";
+ rev = "bbabf9480bb2b40ac581551883a18dfa6522dd63";
+ sha256 = "sha256-h2LgMhreCgod+H/bNQzY9BvqG9ezkwikwWB3T6gHH04=";
+ };
+ inputs = [
+ (pkgs.arpa2common.overrideAttrs
+ (old: rec {
+ version = "0.7.1";
+
+ src = fetchFromGitLab {
+ owner = "arpa2";
+ repo = "arpa2common";
+ rev = "v${version}";
+ sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64=";
+ };
+ }))
+ ];
+ };
+
aws-auth = {
src = fetchFromGitHub {
name = "aws-auth";
@@ -50,20 +73,21 @@ in
repo = "ngx_brotli";
rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv";
- }; in pkgs.runCommand "ngx_brotli-src" {} ''
- cp -a ${gitsrc} $out
- substituteInPlace $out/filter/config \
- --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
- '';
+ }; in
+ pkgs.runCommand "ngx_brotli-src" { } ''
+ cp -a ${gitsrc} $out
+ substituteInPlace $out/filter/config \
+ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
+ '';
inputs = [ pkgs.brotli ];
};
cache-purge = {
src = fetchFromGitHub {
name = "cache-purge";
- owner = "nginx-modules";
- repo = "ngx_cache_purge";
- rev = "2.5.1";
+ owner = "nginx-modules";
+ repo = "ngx_cache_purge";
+ rev = "2.5.1";
sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
};
};
@@ -71,9 +95,9 @@ in
coolkit = {
src = fetchFromGitHub {
name = "coolkit";
- owner = "FRiCKLE";
- repo = "ngx_coolkit";
- rev = "0.2";
+ owner = "FRiCKLE";
+ repo = "ngx_coolkit";
+ rev = "0.2";
sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
};
};
@@ -141,13 +165,14 @@ in
};
ipscrub = {
- src = fetchFromGitHub {
- name = "ipscrub";
- owner = "masonicboom";
- repo = "ipscrub";
- rev = "v1.0.1";
- sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
- } + "/ipscrub";
+ src = fetchFromGitHub
+ {
+ name = "ipscrub";
+ owner = "masonicboom";
+ repo = "ipscrub";
+ rev = "v1.0.1";
+ sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
+ } + "/ipscrub";
inputs = [ pkgs.libbsd ];
};
@@ -161,7 +186,7 @@ in
};
};
- live ={
+ live = {
src = fetchFromGitHub {
name = "live";
owner = "arut";
@@ -228,7 +253,7 @@ in
};
};
- mpeg-ts ={
+ mpeg-ts = {
src = fetchFromGitHub {
name = "mpeg-ts";
owner = "arut";
@@ -238,14 +263,15 @@ in
};
};
- naxsi ={
- src = fetchFromGitHub {
- name = "naxsi";
- owner = "nbs-system";
- repo = "naxsi";
- rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
- sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
- } + "/naxsi_src";
+ naxsi = {
+ src = fetchFromGitHub
+ {
+ name = "naxsi";
+ owner = "nbs-system";
+ repo = "naxsi";
+ rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
+ sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
+ } + "/naxsi_src";
};
opentracing = {
@@ -266,10 +292,10 @@ in
version = pkgs.psol.version;
moduleSrc = fetchFromGitHub {
- name = "pagespeed";
- owner = "pagespeed";
- repo = "ngx_pagespeed";
- rev = "v${version}-stable";
+ name = "pagespeed";
+ owner = "pagespeed";
+ repo = "ngx_pagespeed";
+ rev = "v${version}-stable";
sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
};
@@ -278,8 +304,8 @@ in
{
meta = {
description = "PageSpeed module for Nginx";
- homepage = "https://developers.google.com/speed/pagespeed/module/";
- license = pkgs.lib.licenses.asl20;
+ homepage = "https://developers.google.com/speed/pagespeed/module/";
+ license = pkgs.lib.licenses.asl20;
};
}
''
@@ -287,7 +313,8 @@ in
chmod -R +w "$out"
ln -s "${pkgs.psol}" "$out/psol"
'';
- in {
+ in
+ {
src = ngx_pagespeed;
inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
allowMemoryWriteExecute = true;
@@ -314,7 +341,7 @@ in
};
};
- push-stream ={
+ push-stream = {
src = fetchFromGitHub {
name = "push-stream";
owner = "wandenberg";
@@ -378,9 +405,9 @@ in
slowfs-cache = {
src = fetchFromGitHub {
name = "slowfs-cache";
- owner = "FRiCKLE";
- repo = "ngx_slowfs_cache";
- rev = "1.10";
+ owner = "FRiCKLE";
+ repo = "ngx_slowfs_cache";
+ rev = "1.10";
sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
};
};
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 92fe6e0403a2..064d138d3985 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -24,11 +24,11 @@ let
in stdenv.mkDerivation rec {
pname = "postfix";
- version = "3.6.3";
+ version = "3.6.4";
src = fetchurl {
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
- sha256 = "1g5ii5vvcr87qkabsbyg3n7kzy1g5k2n5gwa8468w5d0ava424hg";
+ hash = "sha256-jeBhnc8vp8IVqAz4S4KrcWMdTUciy6CUlyXOPhgDHU4=";
};
nativeBuildInputs = [ makeWrapper m4 ];
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index 4c546b0631e2..b494ed7e9974 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "367.0.0";
+ version = "370.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-x86_64.tar.gz";
- sha256 = "1zhymqk0ax8qjywwa9w3dvhia8khwkq9xaza5vnbg8arcnf8ncll";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86_64.tar.gz";
+ sha256 = "0qkgny15k8bni5zwkqqcn9h7nzy9g71ykbxf33g3zni7l2icy985";
};
x86_64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-darwin-x86_64.tar.gz";
- sha256 = "0cq22jgmsclp6gaylbh53fbwvl8hi4zswknb6kwqmadhd35a6347";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-x86_64.tar.gz";
+ sha256 = "15p1gvwd1wzjl6a4pa7madbakvy5xmjd0k0mp6c7ci8rwgi431g0";
};
aarch64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-arm.tar.gz";
- sha256 = "1vmg5665m0hwy8kd4snc1hq7qk81pdmyk94ryg8zpjliwmna65iy";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-arm.tar.gz";
+ sha256 = "1xgxg6w7j8y7q8glzji69sh5g3bz1jhjk6jhmmv68c1l7p5na3bg";
};
aarch64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-darwin-arm.tar.gz";
- sha256 = "00p0ww72sn4l9cjcjcml43hj0hlbmcnc1razg99fx1s88h0v928n";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-arm.tar.gz";
+ sha256 = "19ywsi52sla9wprgmrhlr3q91np9pacspjj58qb7m506pl44hmk4";
};
i686-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-x86.tar.gz";
- sha256 = "1pyjb53imjrfn2izyl60kasysi11virybvnsr2sn1c5d97lx1aah";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86.tar.gz";
+ sha256 = "0k4c1kgkvbhwm5fy3yfc2i9rlf7wf186v20nl428dd9742ppa92f";
};
};
}
diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh
index ac6bee4dfe64..2aae6129db5e 100755
--- a/pkgs/tools/admin/google-cloud-sdk/update.sh
+++ b/pkgs/tools/admin/google-cloud-sdk/update.sh
@@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
-VERSION="367.0.0"
+VERSION="370.0.0"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index b0c8a5b9ef6d..8c886b0e2dc7 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "unrar";
- version = "6.1.3";
+ version = "6.1.4";
src = fetchurl {
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
- sha256 = "sha256-0FAiRCAJICp5LliL7FiSHBI/8Eb8dV9/InKHGlvXljY=";
+ sha256 = "sha256-wO1YYpJDlhw/HskMCLEf+TJh5Wjb/c4r87dZ7npKO3w=";
};
postPatch = ''
diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch
index b88d6e0231ea..2830acdd9655 100644
--- a/pkgs/tools/misc/diffoscope/ignore_links.patch
+++ b/pkgs/tools/misc/diffoscope/ignore_links.patch
@@ -6,7 +6,7 @@ index 5f34d62..36999a3 100644
FILE_RE = re.compile(r"^\s*File:.*$")
DEVICE_RE = re.compile(r"Device: [0-9a-f]+h/[0-9]+d\s+")
INODE_RE = re.compile(r"Inode: [0-9]+\s+")
-+ LINKS_RE = re.compile(r'Links: [0-9]+\s+')
++ LINKS_RE = re.compile(r"Links: [0-9]+\s+")
ACCESS_TIME_RE = re.compile(r"^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
CHANGE_TIME_RE = re.compile(r"^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
BIRTH_TIME_RE = re.compile(r"^\s*Birth:.*$")
diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix
index 3d7b9c25cecd..83be1943a308 100644
--- a/pkgs/tools/misc/disfetch/default.nix
+++ b/pkgs/tools/misc/disfetch/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "disfetch";
- version = "3.2";
+ version = "3.3";
src = fetchFromGitHub {
owner = "q60";
repo = "disfetch";
rev = version;
- sha256 = "sha256-NsYfKnWwkPLd//YU8p9e8jeoM8ZmbBlzi2jkHBOXT/M=";
+ sha256 = "sha256-pKjSEK0DuQf2rBkOtqRhfhnpEHMqvmXwzKrwKL/T3QU=";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index d79030f0f429..537b964f6f0b 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -17,14 +17,14 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
- version = "2022.1.1";
+ version = "2022.1.2";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-cqL+54Hjqql1YpsXEFLTD5UhxoEizFSr//4TZm7QEVU=";
+ sha256 = "sha256-hq+gYhDkEzIqgP4CcHRuA5A9694L3LeW9bditejfjm8=";
};
patches = [
diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix
index 50648716e1c3..0e2db1b986a2 100644
--- a/pkgs/tools/misc/mmctl/default.nix
+++ b/pkgs/tools/misc/mmctl/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "mmctl";
- version = "6.2.1";
+ version = "6.3.0";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mmctl";
rev = "v${version}";
- sha256 = "sha256-DhkBiczQ+4iwoufHMuy6Fn3a4q7gvkKGXTfLcUCCKis=";
+ sha256 = "sha256-hrNVDHM8AweAdda9SC29EGhkOhdiLD0EE1BLPhwe5SI=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 379c89621016..468fa433e846 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -29,7 +29,7 @@
let
pname = "vector";
- version = "0.19.0";
+ version = "0.19.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -38,10 +38,10 @@ rustPlatform.buildRustPackage {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-A+Ok/BNEs0V00B8P6ghSHZ2pQ8tumfpkurplnvjpWZ8=";
+ sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs=";
};
- cargoSha256 = "sha256-B9z+8TqAl0yFaou1LfNcFsDJjw7qGti6MakDPhz49tc=";
+ cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q=";
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@@ -71,8 +71,10 @@ rustPlatform.buildRustPackage {
# flaky on linux-x86_64
"--skip=sources::socket::test::tcp_with_tls_intermediate_ca"
-
"--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics"
+ "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events"
+ "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events_gzip_request"
+ "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure"
];
# recent overhauls of DNS support in 0.9 mean that we try to resolve
diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/tools/networking/dnstake/default.nix
index d32cf0fedbbb..9ddf853b7d9b 100644
--- a/pkgs/tools/networking/dnstake/default.nix
+++ b/pkgs/tools/networking/dnstake/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dnstake";
- version = "0.0.2";
+ version = "0.1.0";
src = fetchFromGitHub {
owner = "pwnesia";
repo = pname;
rev = "v${version}";
- sha256 = "0mjwnb0zyqnwk26f32v9vqxc9k6zcks9nn1595mf2hck5xwn86yk";
+ sha256 = "sha256-XfZDRu1UrH5nVh1GQCQVaEamKorWSOxQZs556iDqfS8=";
};
- vendorSha256 = "1xhzalx1x8js449w1qs2qdwbnz2s8mmypz9maj7jzl5mqfyhlwlp";
+ vendorSha256 = "sha256-l3IKvcO10C+PVDX962tFWny7eMNC48ATIVqiHjpVH/Y=";
meta = with lib; {
description = "Tool to check missing hosted DNS zones";
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 705b2397c6ac..46093f2c5b94 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
appdirs
cssselect
+ jq
keyring
lxml
markdown2
diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix
index 76b0c1fa9824..5fb88ca9921b 100644
--- a/pkgs/tools/security/amber/default.nix
+++ b/pkgs/tools/security/amber/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
# Renaming it to amber-secret because another package named amber exists
pname = "amber-secret";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "fpco";
repo = "amber";
rev = "v${version}";
- sha256 = "1l5c7vdi885z56nqqbm4sw9hvqk3rfzm0mgcwk5cbwjlrz7yjq4m";
+ sha256 = "sha256-+vipQl/HWoYnOPkQLjeIedpnnqPVYaUWhks9eCgMOxQ=";
};
- cargoSha256 = "0dmhlyrw6yd7p80v7anz5nrd28bcrhq27vzy605dinddvncjn13q";
+ cargoSha256 = "sha256-xWEQvCyd8auE0q9rBt9iDgU8Dscf4pq/gsAINH2eQY4=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix
index 121c71fab351..a9e554ff42cc 100644
--- a/pkgs/tools/security/beyond-identity/default.nix
+++ b/pkgs/tools/security/beyond-identity/default.nix
@@ -5,7 +5,7 @@
let
pname = "beyond-identity";
- version = "2.45.0-0";
+ version = "2.49.0-0";
libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]);
meta = with lib; {
description = "Passwordless MFA identities for workforces, customers, and developers";
@@ -21,7 +21,7 @@ let
src = fetchurl {
url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb";
- sha512 = "852689d473b7538cdca60d264295f39972491b5505accad897fd924504189f0a6d8b6481cc0520ee762d4642e0f4fd664a03b5741f9ea513ec46ab16b05158f2";
+ sha512 = "sha512-+9vwH1r5WW+MqyiwsAFInboaM7o2dc7zvRaKwHC/o2LOBugvUHmUzmZ6uSHilc9zQ5FcHUIIglhkASbFtsvPeA==";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/tools/security/dnspeep/default.nix
index 4af91f8070a2..58abf25b858d 100644
--- a/pkgs/tools/security/dnspeep/default.nix
+++ b/pkgs/tools/security/dnspeep/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "dnspeep";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "jvns";
repo = pname;
rev = "v${version}";
- sha256 = "0lz22vlgi1alsq676q4nlzfzwnsrvziyqdnmdbn00rwqsvlb81q6";
+ sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4=";
};
- cargoSha256 = "sha256-I1m+6M2tmmTZuXlZaecSslj6q2iCsMBq7k9vHiMd3WE=";
+ cargoSha256 = "sha256-w81FewtyweuSNYNPNr2uxB0uB1JoN5t252CAG1pm4Z8=";
LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ];
LIBPCAP_VER = libpcap.version;
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index bc7731a0a7aa..d6f2e20611d2 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Provides extra functionality for the Nitrokey Pro and Storage";
longDescription = ''
- The nitrokey-app provides a QT system tray widget with wich you can
+ The nitrokey-app provides a QT system tray widget with which you can
access the extra functionality of a Nitrokey Storage or Nitrokey Pro.
See https://www.nitrokey.com/ for more information.
'';
diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix
new file mode 100644
index 000000000000..b50550e74368
--- /dev/null
+++ b/pkgs/tools/security/pynitrokey/default.nix
@@ -0,0 +1,44 @@
+{ python3Packages, lib }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+ pname = "pynitrokey";
+ version = "0.4.9";
+ format = "flit";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-mhH6mVgLRX87PSGTFkj1TE75jU1lwcaRZWbC67T+vWo=";
+ };
+
+ propagatedBuildInputs = [
+ click
+ cryptography
+ ecdsa
+ fido2
+ intelhex
+ pyserial
+ pyusb
+ requests
+ pygments
+ python-dateutil
+ urllib3
+ cffi
+ cbor
+ nkdfu
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "pynitrokey" ];
+
+ meta = with lib; {
+ description = "Python client for Nitrokey devices";
+ homepage = "https://github.com/Nitrokey/pynitrokey";
+ license = with licenses; [ asl20 mit ];
+ maintainers = with maintainers; [ frogamic ];
+ mainProgram = "nitropy";
+ };
+}
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 76aea2bbd514..47bf2c8297f8 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -23,13 +23,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M=";
};
- postPatch = ''
- ${optionalString withPkcs11 ''
- substituteInPlace rngd.c \
- --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so
- ''}
- '';
-
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
configureFlags = [
@@ -49,8 +42,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # For cross-compilation
- makeFlags = [ "AR:=$(AR)" ];
+ makeFlags = [
+ "AR:=$(AR)" # For cross-compilation
+ ] ++ optionals (withPkcs11) [
+ "PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths
+ ];
doCheck = true;
preCheck = "patchShebangs tests/*.sh";
diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/tools/security/volatility3/default.nix
index d6a99dd71072..393ac90d3164 100644
--- a/pkgs/tools/security/volatility3/default.nix
+++ b/pkgs/tools/security/volatility3/default.nix
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "volatility3";
- version = "1.0.1";
+ version = "2.0.0";
disabled = python3.pythonOlder "3.6";
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "volatilityfoundation";
repo = pname;
rev = "v${version}";
- sha256 = "1k56izgkla9mrjrkp1saavajdx9x1wkqpwmbpvxv9rw5k80m5a4a";
+ sha256 = "141n09cdc17pfdhs01aw8l4cvsqpcz8ji5l4gi7r88cyf4ix2lnz";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index 570492295542..b7b20996bd3b 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -13,8 +13,8 @@
let
sha256 = "10mlkkprky7qqjrkv43v1lzmlgdjpkzy3729k9xxdm5mpq5bjdwj";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
- specVersion = "4.112.0";
- specSha256 = "1z509qf5iidn6q5x3p7m8aifxn4bmwifx36wv8ii3nn7l4s9aymr";
+ specVersion = "4.112.3";
+ specSha256 = "15qlk0vd6l1gkxjbmvfwwdgjv7517y0kf0s3d32r3m2xqdsw9pc6";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 060f2c068750..7b1ff86b2405 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -284,6 +284,7 @@ mapAliases ({
flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
+ fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # added 2022-01-26
foldingathome = fahclient; # added 2020-09-03
font-awesome-ttf = font-awesome; # 2018-02-25
# 2019-10-31
@@ -412,6 +413,7 @@ mapAliases ({
inotifyTools = inotify-tools;
inter-ui = inter; # added 2021-03-27
iproute = iproute2; # moved from top-level 2021-03-14
+ ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # added 2021-12-15
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jack2Full = jack2; # moved from top-level 2021-03-14
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 759870ec571a..63961133bbe3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8641,11 +8641,6 @@ with pkgs;
pngout = callPackage ../tools/graphics/pngout { };
- ipsecTools = callPackage ../os-specific/linux/ipsec-tools {
- flex = flex_2_5_35;
- openssl = openssl_1_0_2;
- };
-
patch = gnupatch;
patchage = callPackage ../applications/audio/patchage { };
@@ -14236,6 +14231,15 @@ with pkgs;
bazel_self = bazel_4;
};
+ bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
+ inherit (darwin) cctools;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+ buildJdk = jdk11_headless;
+ runJdk = jdk11_headless;
+ stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
+ bazel_self = bazel_5;
+ };
+
bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
buildifier = bazel-buildtools;
buildozer = bazel-buildtools;
@@ -14486,8 +14490,6 @@ with pkgs;
ctmg = callPackage ../tools/security/ctmg { };
- cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
-
cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
@@ -25728,10 +25730,6 @@ with pkgs;
fluxbox = callPackage ../applications/window-managers/fluxbox { };
- fme = callPackage ../applications/misc/fme {
- inherit (gnome2) libglademm;
- };
-
fomp = callPackage ../applications/audio/fomp { };
formatter = callPackage ../applications/misc/formatter { };
@@ -28248,9 +28246,7 @@ with pkgs;
wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
- qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
- withGrass = false;
- };
+ qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };
qgis = callPackage ../applications/gis/qgis { };
@@ -28950,6 +28946,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ talosctl = callPackage ../applications/networking/cluster/talosctl { };
+
talentedhack = callPackage ../applications/audio/talentedhack { };
tambura = callPackage ../applications/audio/tambura { };
@@ -32628,9 +32626,7 @@ with pkgs;
astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { };
- tulip = callPackage ../applications/science/misc/tulip {
- cmake = cmake_2_8;
- };
+ tulip = libsForQt5.callPackage ../applications/science/misc/tulip { };
vite = callPackage ../applications/science/misc/vite { };
@@ -34198,6 +34194,8 @@ with pkgs;
xrq = callPackage ../applications/misc/xrq { };
+ pynitrokey = callPackage ../tools/security/pynitrokey { };
+
nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 183ea8574ce4..9cd3243d1a98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5405,6 +5405,8 @@ in {
nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
+ nkdfu = callPackage ../development/python-modules/nkdfu { };
+
nltk = callPackage ../development/python-modules/nltk { };
nmapthon2 = callPackage ../development/python-modules/nmapthon2 { };