diff --git a/third_party/nixpkgs/doc/functions/library/attrsets.xml b/third_party/nixpkgs/doc/functions/library/attrsets.xml index ef132514da..9d36becd49 100644 --- a/third_party/nixpkgs/doc/functions/library/attrsets.xml +++ b/third_party/nixpkgs/doc/functions/library/attrsets.xml @@ -772,7 +772,7 @@ nameValuePair "some" 6 Modifying each value of an attribute set { x = "x-foo"; y = "y-bar"; } ]]> diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 50e52c9ec0..4829cdb792 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -390,6 +390,12 @@ githubId = 1318982; name = "Anders Claesson"; }; + akho = { + name = "Alexander Khodyrev"; + email = "a@akho.name"; + github = "akho"; + githubId = 104951; + }; akru = { email = "mail@akru.me"; github = "akru"; @@ -2283,6 +2289,12 @@ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; + d-xo = { + email = "hi@d-xo.org"; + github = "d-xo"; + githubId = 6689924; + name = "David Terry"; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -3237,6 +3249,12 @@ fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; }]; }; + ereslibre = { + email = "ereslibre@ereslibre.es"; + github = "ereslibre"; + githubId = 8706; + name = "Rafael Fernández López"; + }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; @@ -8562,6 +8580,12 @@ github = "polygon"; githubId = 51489; }; + polykernel = { + email = "81340136+polykernel@users.noreply.github.com"; + github = "polykernel"; + githubId = 81340136; + name = "polykernel"; + }; polyrod = { email = "dc1mdp@gmail.com"; github = "polyrod"; @@ -11698,12 +11722,6 @@ githubId = 1962985; name = "Vincenzo Mantova"; }; - xwvvvvwx = { - email = "davidterry@posteo.de"; - github = "xwvvvvwx"; - githubId = 6689924; - name = "David Terry"; - }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 3ba4e16e77..f872982017 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -5,7 +5,7 @@ when developing or debugging a test: ```ShellSession $ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-test-driver +$ ./result/bin/nixos-test-driver --interactive starting VDE switch for network 1 > ``` @@ -24,20 +24,11 @@ back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). -To just start and experiment with the VMs, run: - -```ShellSession -$ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-run-vms -``` - -The script `nixos-run-vms` starts the virtual machines defined by test. - You can re-use the VM states coming from a previous run by setting the `--keep-vm-state` flag. ```ShellSession -$ ./result/bin/nixos-run-vms --keep-vm-state +$ ./result/bin/nixos-test-driver --interactive --keep-vm-state ``` The machine state is stored in the `$TMPDIR/vm-state-machinename` diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml index a2030e9c07..17003cbcbf 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -6,7 +6,7 @@ $ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-test-driver +$ ./result/bin/nixos-test-driver --interactive starting VDE switch for network 1 > @@ -25,23 +25,12 @@ starting VDE switch for network 1 completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). - - To just start and experiment with the VMs, run: - - -$ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-run-vms - - - The script nixos-run-vms starts the virtual - machines defined by test. - You can re-use the VM states coming from a previous run by setting the --keep-vm-state flag. -$ ./result/bin/nixos-run-vms --keep-vm-state +$ ./result/bin/nixos-test-driver --interactive --keep-vm-state The machine state is stored in the diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f241bff076..27175564e9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -646,6 +646,32 @@ to use wildcards in the source argument. + + + The openrazer and + openrazer-daemon packages as well as the + hardware.openrazer module now require users + to be members of the openrazer group + instead of plugdev. With this change, users + no longer need be granted the entire set of + plugdev group permissions, which can + include permissions other than those required by + openrazer. This is desirable from a + security point of view. The setting + harware.openrazer.users + can be used to add users to the openrazer + group. + + + + + The yambar package has been split into + yambar and + yambar-wayland, corresponding to the xorg + and wayland backend respectively. Please switch to + yambar-wayland if you are on wayland. + +
@@ -815,6 +841,15 @@ version of zfs. + + + Nginx will use the value of + sslTrustedCertificate if provided for a + virtual host, even if enableACME is set. + This is useful for providers not using the same certificate to + sign OCSP responses and server certificates. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 13cb08e2c9..8596cea10d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -164,6 +164,10 @@ pt-services.clipcat.enable). - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. +- The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. + +- The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. @@ -209,3 +213,5 @@ pt-services.clipcat.enable). - The [services.syncoid.enable](options.html#opt-services.syncoid.enable) module now properly drops ZFS permissions after usage. Before it delegated permissions to whole pools instead of datasets and didn't clean up after execution. You can manually look this up for your pools by running `zfs allow your-pool-name` and use `zfs unallow syncoid your-pool-name` to clean this up. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. + +- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py old mode 100644 new mode 100755 index 2a3e4d94b9..1720e553d7 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -24,7 +24,6 @@ import sys import telnetlib import tempfile import time -import traceback import unicodedata CHAR_TO_KEY = { @@ -930,29 +929,16 @@ def join_all() -> None: machine.wait_for_shutdown() -def test_script() -> None: - exec(os.environ["testScript"]) - - -def run_tests() -> None: +def run_tests(interactive: bool = False) -> None: global machines - tests = os.environ.get("tests", None) - if tests is not None: - with log.nested("running the VM test script"): - try: - exec(tests, globals()) - except Exception as e: - eprint("error: ") - traceback.print_exc() - sys.exit(1) + if interactive: + ptpython.repl.embed(globals(), locals()) else: - ptpython.repl.embed(locals(), globals()) - - # TODO: Collect coverage data - - for machine in machines: - if machine.is_up(): - machine.execute("sync") + test_script() + # TODO: Collect coverage data + for machine in machines: + if machine.is_up(): + machine.execute("sync") def serial_stdout_on() -> None: @@ -965,6 +951,31 @@ def serial_stdout_off() -> None: log._print_serial_logs = False +class EnvDefault(argparse.Action): + """An argpars Action that takes values from the specified + environment variable as the flags default value. + """ + + def __init__(self, envvar, required=False, default=None, nargs=None, **kwargs): # type: ignore + if not default and envvar: + if envvar in os.environ: + if nargs is not None and (nargs.isdigit() or nargs in ["*", "+"]): + default = os.environ[envvar].split() + else: + default = os.environ[envvar] + kwargs["help"] = ( + kwargs["help"] + f" (default from environment: {default})" + ) + if required and default: + required = False + super(EnvDefault, self).__init__( + default=default, required=required, nargs=nargs, **kwargs + ) + + def __call__(self, parser, namespace, values, option_string=None): # type: ignore + setattr(namespace, self.dest, values) + + @contextmanager def subtest(name: str) -> Iterator[None]: with log.nested(name): @@ -986,18 +997,52 @@ if __name__ == "__main__": help="re-use a VM state coming from a previous run", action="store_true", ) - (cli_args, vm_scripts) = arg_parser.parse_known_args() + arg_parser.add_argument( + "-I", + "--interactive", + help="drop into a python repl and run the tests interactively", + action="store_true", + ) + arg_parser.add_argument( + "--start-scripts", + metavar="START-SCRIPT", + action=EnvDefault, + envvar="startScripts", + nargs="*", + help="start scripts for participating virtual machines", + ) + arg_parser.add_argument( + "--vlans", + metavar="VLAN", + action=EnvDefault, + envvar="vlans", + nargs="*", + help="vlans to span by the driver", + ) + arg_parser.add_argument( + "testscript", + action=EnvDefault, + envvar="testScript", + help="the test script to run", + type=pathlib.Path, + ) + + args = arg_parser.parse_args() + global test_script + + def test_script() -> None: + with log.nested("running the VM test script"): + exec(pathlib.Path(args.testscript).read_text(), globals()) log = Logger() - vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) - vde_sockets = [create_vlan(v) for v in vlan_nrs] + vde_sockets = [create_vlan(v) for v in args.vlans] for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket machines = [ - create_machine({"startCommand": s, "keepVmState": cli_args.keep_vm_state}) - for s in vm_scripts + create_machine({"startCommand": s, "keepVmState": args.keep_vm_state}) + for s in args.start_scripts ] machine_eval = [ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) @@ -1017,6 +1062,6 @@ if __name__ == "__main__": log.close() tic = time.time() - run_tests() + run_tests(args.interactive) toc = time.time() print("test script finished in {:.2f}s".format(toc - tic)) diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index c703484666..6369d6ef05 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -83,7 +83,10 @@ rec { '' mkdir -p $out - LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver + # effectively mute the XMLLogger + export LOGFILE=/dev/null + + ${driver}/bin/nixos-test-driver ''; passthru = driver.passthru // { @@ -166,7 +169,10 @@ rec { '' mkdir -p $out/bin + vmStartScripts=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) echo -n "$testScript" > $out/test-script + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-test-driver + ${lib.optionalString (!skipLint) '' PYFLAKES_BUILTINS="$( echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, @@ -174,17 +180,12 @@ rec { )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) + # set defaults through environment + # see: ./test-driver/test-driver.py argparse implementation wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' + --set startScripts "''${vmStartScripts[*]}" \ + --set testScript "$out/test-script" \ + --set vlans '${toString vlans}' ''); # Make a full-blown test diff --git a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix index b5c3d67441..bd9fc485e1 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix @@ -49,7 +49,9 @@ in { options = { hardware.openrazer = { - enable = mkEnableOption "OpenRazer drivers and userspace daemon"; + enable = mkEnableOption '' + OpenRazer drivers and userspace daemon. + ''; verboseLogging = mkOption { type = types.bool; @@ -92,6 +94,15 @@ in generate a heatmap. ''; }; + + users = mkOption { + type = with types; listOf str; + default = []; + description = '' + Usernames to be added to the "openrazer" group, so that they + can start and interact with the OpenRazer userspace daemon. + ''; + }; }; }; @@ -106,10 +117,12 @@ in services.udev.packages = [ kernelPackages.openrazer ]; services.dbus.packages = [ dbusServiceFile ]; - # A user must be a member of the plugdev group in order to start - # the openrazer-daemon. Therefore we make sure that the plugdev - # group exists. - users.groups.plugdev = {}; + # A user must be a member of the openrazer group in order to start + # the openrazer-daemon. Therefore we make sure that the group + # exists. + users.groups.openrazer = { + members = cfg.users; + }; systemd.user.services.openrazer-daemon = { description = "Daemon to manage razer devices in userspace"; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 2be9da8f42..1e125eced2 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -179,28 +179,41 @@ in You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor. ''; } + { assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' When NVIDIA PRIME is enabled, the GPU bus IDs must configured. ''; } + { assertion = offloadCfg.enable -> versionAtLeast nvidia_x11.version "435.21"; message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21."; } + { assertion = !(syncCfg.enable && offloadCfg.enable); message = "Only one NVIDIA PRIME solution may be used at a time."; } + { assertion = !(syncCfg.enable && cfg.powerManagement.finegrained); message = "Sync precludes powering down the NVIDIA GPU."; } + { assertion = cfg.powerManagement.enable -> offloadCfg.enable; message = "Fine-grained power management requires offload to be enabled."; } + + { + assertion = cfg.powerManagement.enable -> ( + builtins.pathExists (cfg.package.out + "/bin/nvidia-sleep.sh") && + builtins.pathExists (cfg.package.out + "/lib/systemd/system-sleep/nvidia") + ); + message = "Required files for driver based power management don't exist."; + } ]; # If Optimus/PRIME is enabled, we: diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index d4a7769bbd..795f1a9f7b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -14,7 +14,7 @@ let '' #! ${pkgs.runtimeShell} -e export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')" - exec ${askPassword} + exec ${askPassword} "$@" ''; knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); diff --git a/third_party/nixpkgs/nixos/modules/programs/udevil.nix b/third_party/nixpkgs/nixos/modules/programs/udevil.nix index 25975d88ec..ba5670f9df 100644 --- a/third_party/nixpkgs/nixos/modules/programs/udevil.nix +++ b/third_party/nixpkgs/nixos/modules/programs/udevil.nix @@ -10,8 +10,5 @@ in { config = mkIf cfg.enable { security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; - - systemd.packages = [ pkgs.udevil ]; - systemd.services."devmon@".wantedBy = [ "multi-user.target" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index 22bf34198a..bcbd17d8e1 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -21,15 +21,51 @@ let # The Group can vary depending on what the user has specified in # security.acme.certs..group on some of the services. commonServiceConfig = { - Type = "oneshot"; - User = "acme"; - Group = mkDefault "acme"; - UMask = 0022; - StateDirectoryMode = 750; - ProtectSystem = "full"; - PrivateTmp = true; + Type = "oneshot"; + User = "acme"; + Group = mkDefault "acme"; + UMask = 0022; + StateDirectoryMode = 750; + ProtectSystem = "strict"; + ReadWritePaths = [ + "/var/lib/acme" + ]; + PrivateTmp = true; - WorkingDirectory = "/tmp"; + WorkingDirectory = "/tmp"; + + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + ProtectClock = true; + ProtectHome = true; + ProtectHostname = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + # 1. allow a reasonable set of syscalls + "@system-service" + # 2. and deny unreasonable ones + "~@privileged @resources" + # 3. then allow the required subset within denied groups + "@chown" + ]; }; # In order to avoid race conditions creating the CA for selfsigned certs, diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index a6724bd758..f556cca23c 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -96,8 +96,10 @@ in users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; + group = "polkituser"; }; + users.groups.polkituser = {}; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix index 5b09115bb2..9e2c79e61a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix @@ -53,6 +53,14 @@ let cfg = config.services.victoriametrics; in -retentionPeriod ${toString cfg.retentionPeriod} \ ${lib.escapeShellArgs cfg.extraOptions} ''; + # victoriametrics 1.59 with ~7GB of data seems to eventually panic when merging files and then + # begins restart-looping forever. Set LimitNOFILE= to a large number to work around this issue. + # + # panic: FATAL: unrecoverable error when merging small parts in the partition "/var/lib/victoriametrics/data/small/2021_08": + # cannot open source part for merging: cannot open values file in stream mode: + # cannot open file "/var/lib/victoriametrics/data/small/2021_08/[...]/values.bin": + # open /var/lib/victoriametrics/data/small/2021_08/[...]/values.bin: too many open files + LimitNOFILE = 1048576; }; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index 7c527b2921..cae9e1bdba 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -27,6 +27,12 @@ "msbc-alt1-rtl" ] }, + { + "name": "BAA 100", + "no-features": [ + "hw-volume" + ] + }, { "name": "JBL Endurance RUN BT", "no-features": [ @@ -190,6 +196,35 @@ "msbc-alt1" ] }, + { + "sysname": "Linux", + "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])" + }, + { + "sysname": "Linux", + "release": "~^5\\.12\\.", + "no-features": [ + "msbc-alt1" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.13\\.(1|2)($|[^0-9])" + }, + { + "sysname": "Linux", + "release": "~^5\\.13\\.", + "no-features": [ + "msbc-alt1" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.14\\.", + "no-features": [ + "msbc-alt1" + ] + }, { "no-features": [] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json index e36e04fffc..128178bfa0 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json @@ -24,5 +24,15 @@ "name": "libpipewire-module-metadata" } ], - "jack.properties": {} + "jack.properties": {}, + "jack.rules": [ + { + "matches": [ + {} + ], + "actions": { + "update-props": {} + } + } + ] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json index 24906e767d..4b4e302af3 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json @@ -59,6 +59,7 @@ "with-pulseaudio": [ "with-audio", "bluez5", + "bluez5-autoswitch", "logind", "restore-stream", "streams-follow-default" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix b/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix index 09874ca0ed..f9c3456699 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix @@ -220,7 +220,7 @@ with lib; after = [ "network.target" ]; preStart = '' - mkdir -p /var/spool/nullmailer/{queue,tmp} + mkdir -p /var/spool/nullmailer/{queue,tmp,failed} rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index 2f8e595cad..8322b7c090 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -522,6 +522,9 @@ in (umask 027; gitea_setup) ''} + # run migrations/init the database + ${gitea}/bin/gitea migrate + # update all hooks' binary paths ${gitea}/bin/gitea admin regenerate hooks diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix index 095a15f21f..301af76c33 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix @@ -312,6 +312,31 @@ in AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; RestartSec = "5s"; + # Hardening + CapabilityBoundingSet = if (cfg.server.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + # A private user cannot have process capabilities on the host's user + # namespace and thus CAP_NET_BIND_SERVICE has no effect. + PrivateUsers = (cfg.server.port >= 1024); + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix index 8ce71f26b3..9ec1ddc929 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix @@ -9,6 +9,7 @@ with lib; default = false; description = '' This option enables Mullvad VPN daemon. + This sets to "loose", which might be undesirable for security. ''; }; @@ -18,6 +19,9 @@ with lib; # mullvad-daemon writes to /etc/iproute2/rt_tables networking.iproute2.enable = true; + # See https://github.com/NixOS/nixpkgs/issues/113589 + networking.firewall.checkReversePath = "loose"; + systemd.services.mullvad-daemon = { description = "Mullvad VPN daemon"; wantedBy = [ "multi-user.target" ]; @@ -42,5 +46,5 @@ with lib; }; }; - meta.maintainers = [ maintainers.xfix ]; + meta.maintainers = with maintainers; [ ymarkus ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index a4b17bbbff..ed61c178c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -81,17 +81,26 @@ in ''; }; - initstepslew = mkOption { - type = types.attrsOf (types.either types.bool types.int); - default = { - enabled = true; - threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s) + initstepslew = { + enabled = mkOption { + type = types.bool; + default = true; + description = '' + Allow chronyd to make a rapid measurement of the system clock error + at boot time, and to correct the system clock by stepping before + normal operation begins. + ''; + }; + + threshold = mkOption { + type = types.either types.float types.int; + default = 1000; # by default, same threshold as 'ntpd -g' (1000s) + description = '' + The threshold of system clock error (in seconds) above which the + clock will be stepped. If the correction required is less than the + threshold, a slew is used instead. + ''; }; - description = '' - Allow chronyd to make a rapid measurement of the system clock error at - boot time, and to correct the system clock by stepping before normal - operation begins. - ''; }; directory = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix index 9e433ad1a9..22caf9f4ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix @@ -427,9 +427,12 @@ in nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; + group = "tinc.${network}"; }) ); - + users.groups = flip mapAttrs' cfg.networks (network: _: + nameValuePair "tinc.${network}" {} + ); }; meta.maintainers = with maintainers; [ minijackson ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 62bcf7a149..2e320378cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -173,6 +173,41 @@ in User = "unifi"; UMask = "0077"; WorkingDirectory = "${stateDir}"; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ "@system-service" ]; + + # Required for ProtectSystem=strict + BindPaths = [ stateDir ]; + + # Needs network access + PrivateNetwork = false; + # Cannot be true due to OpenJDK + MemoryDenyWriteExecute = false; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix b/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix index f41b6ec274..c6291366b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wakeonlan.nix @@ -31,6 +31,20 @@ in services.wakeonlan.interfaces = mkOption { default = [ ]; + type = types.listOf (types.submodule { options = { + interface = mkOption { + type = types.str; + description = "Interface to enable for Wake-On-Lan."; + }; + method = mkOption { + type = types.enum [ "magicpacket" "password"]; + description = "Wake-On-Lan method for this interface."; + }; + password = mkOption { + type = types.strMatching "[a-fA-F0-9]{2}:([a-fA-F0-9]{2}:){4}[a-fA-F0-9]{2}"; + description = "The password has the shape of six bytes in hexadecimal separated by a colon each."; + }; + };}); example = [ { interface = "eth0"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 01710b1bd5..1bbadafa20 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -98,6 +98,29 @@ in EnvironmentFile = if cfg.adminCredentialsFile == null then defaultCredentials else cfg.adminCredentialsFile; + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; }; environment = cfg.config; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index ebb3c38d6c..136811ada4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -22,7 +22,9 @@ let } // (optionalAttrs (vhostConfig.enableACME || vhostConfig.useACMEHost != null) { sslCertificate = "${certs.${certName}.directory}/fullchain.pem"; sslCertificateKey = "${certs.${certName}.directory}/key.pem"; - sslTrustedCertificate = "${certs.${certName}.directory}/chain.pem"; + sslTrustedCertificate = if vhostConfig.sslTrustedCertificate != null + then vhostConfig.sslTrustedCertificate + else "${certs.${certName}.directory}/chain.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index bc18bcaa7b..bbf4ccb01c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -145,7 +145,7 @@ with lib; sslTrustedCertificate = mkOption { type = types.nullOr types.path; default = null; - example = "/var/root.cert"; + example = "\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; description = "Path to root SSL certificate for stapling and client certificates."; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 73616065a0..b53cb9e7d4 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -1128,6 +1128,7 @@ in users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.users.systemd-journal-gateway.group = "systemd-journal-gateway"; users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index 183de72921..6971ab42d9 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -8,10 +8,7 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.runCommand "etc" { - preferLocalBuild = true; - allowSubstitutes = false; - + etc = pkgs.runCommandLocal "etc" { # This is needed for the systemd module passthru.targets = map (x: x.target) etc'; } /* sh */ '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix index c7ceb816a3..43cb6273f2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix @@ -86,6 +86,7 @@ in StateDirectory = "containerd"; RuntimeDirectory = "containerd"; + RuntimeDirectoryPreserve = "yes"; }; unitConfig = { StartLimitBurst = "16"; diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index 6532fc4ac1..72b7bb8a39 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -105,9 +105,9 @@ in import ./make-test-python.nix ({ lib, ... }: { security.acme.certs."a.example.test".keyType = "ec384"; security.acme.certs."a.example.test".postRun = '' set -euo pipefail - touch test - chown root:root test - echo testing > test + touch /home/test + chown root:root /home/test + echo testing > /home/test ''; }; @@ -383,7 +383,7 @@ in import ./make-test-python.nix ({ lib, ... }: { switch_to(webserver, "cert-change") webserver.wait_for_unit("acme-finished-a.example.test.target") check_connection_key_bits(client, "a.example.test", "384") - webserver.succeed("grep testing /var/lib/acme/a.example.test/test") + webserver.succeed("grep testing /home/test") # Clean to remove the testing file (and anything else messy we did) webserver.succeed("systemctl clean acme-a.example.test.service --what=state") diff --git a/third_party/nixpkgs/nixos/tests/bazarr.nix b/third_party/nixpkgs/nixos/tests/bazarr.nix index b8cd8ef38b..c3337611aa 100644 --- a/third_party/nixpkgs/nixos/tests/bazarr.nix +++ b/third_party/nixpkgs/nixos/tests/bazarr.nix @@ -7,7 +7,7 @@ let in { name = "bazarr"; - meta.maintainers = with maintainers; [ xwvvvvwx ]; + meta.maintainers = with maintainers; [ d-xo ]; nodes.machine = { pkgs, ... }: diff --git a/third_party/nixpkgs/nixos/tests/nitter.nix b/third_party/nixpkgs/nixos/tests/nitter.nix index e17f1c4734..0e1a6d150f 100644 --- a/third_party/nixpkgs/nixos/tests/nitter.nix +++ b/third_party/nixpkgs/nixos/tests/nitter.nix @@ -6,11 +6,13 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes.machine = { services.nitter.enable = true; + # Test CAP_NET_BIND_SERVICE + services.nitter.server.port = 80; }; testScript = '' machine.wait_for_unit("nitter.service") - machine.wait_for_open_port("8080") - machine.succeed("curl --fail http://localhost:8080/") + machine.wait_for_open_port("80") + machine.succeed("curl --fail http://localhost:80/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix b/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix index 8cf8c307de..961c2e15c3 100644 --- a/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix +++ b/third_party/nixpkgs/nixos/tests/wireguard/wg-quick.nix @@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "wg-quick"; meta = with pkgs.lib.maintainers; { - maintainers = [ xwvvvvwx ]; + maintainers = [ d-xo ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix index 2eb06d8828..a004b124dd 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/prosody.nix @@ -1,6 +1,6 @@ let cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 mkdir -p $out cp key.pem cert.pem $out ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 09be8faa8a..591c14c1ad 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -2,7 +2,6 @@ , stdenv , lib , fetchFromGitHub -, fetchpatch , qmake , pkg-config , qttools @@ -13,25 +12,16 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.4.6"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "rerrahkr"; + owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; + fetchSubmodules = true; + sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; }; - # TODO Remove when updating past 0.4.6 - # Fixes build failure on darwin - patches = [ - (fetchpatch { - name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; - url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; - sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; - }) - ]; - nativeBuildInputs = [ qmake qttools pkg-config ]; buildInputs = [ qtbase rtaudio rtmidi ]; @@ -40,18 +30,20 @@ mkDerivation rec { postConfigure = "make qmake_all"; - # installs app bundle on darwin, re-extract the binary - # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044) + # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin + # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper + # (see https://github.com/NixOS/nixpkgs/issues/102044) postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,} - rm -r $out/bin/BambooTracker.app - wrapQtApp $out/bin/BambooTracker + mkdir -p $out/Applications + mv $out/{bin,Applications}/BambooTracker.app + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker + ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker ''; meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - homepage = "https://rerrahkr.github.io/BambooTracker"; - license = licenses.gpl2Only; + homepage = "https://bambootracker.github.io/BambooTracker/"; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/boops/default.nix b/third_party/nixpkgs/pkgs/applications/audio/boops/default.nix index b1b91aaf9d..de766f14db 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/boops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/boops/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "boops"; - version = "1.6.0"; + version = "1.6.4"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BOops"; rev = version; - sha256 = "sha256-7eNvt8PxIZCp83Y5XX5fBolBon4j+HPtu8wrgG8Miok="; + sha256 = "sha256-rljUb0fj231MQh+7jTpjAsZm1QkNzfdSpcI1cS5fs/c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index 5eb71cbe04..88ac800214 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -8,11 +8,13 @@ , gtk3 , gst_all_1 , gobject-introspection +, libhandy , python3Packages , file , cairo , gettext , gnome +, pantheon }: python3Packages.buildPythonApplication rec { @@ -20,7 +22,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "0.7.2"; + version = "1.0.3"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -31,7 +33,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "0fmbddi4ga0bppwg3rm3yjmf7jgqc6zfslmavnr1pglbzkjhy9fs"; + sha256 = "0m0xiqpb87pwr3fhy0a4qxg67yjhwchcxj3x2anyy0li4inryxag"; }; nativeBuildInputs = [ @@ -47,6 +49,8 @@ python3Packages.buildPythonApplication rec { cairo gettext gnome.adwaita-icon-theme + libhandy + pantheon.granite ] ++ (with gst_all_1; [ gstreamer gst-plugins-good @@ -70,8 +74,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py + patchShebangs meson/*.py ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix index cc98e9fb35..39c8a3b318 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "helvum"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ryuukyu"; repo = pname; rev = version; - sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A="; + sha256 = "sha256-AlHCK4pWaoNjR0eflxHBsuVaaily/RvCbgJv/ByQZK4="; }; - cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU="; + cargoSha256 = "sha256-mAhh12rGvQjs2xtm+OrtVv0fgG6qni/QM/oRYoFR7U8="; nativeBuildInputs = [ clang copyDesktopItems pkg-config ]; buildInputs = [ glib gtk4 pipewire ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix index 0d6f33ca3a..64a8da8b97 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndconnect/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "Generate QRCode to connect apps to lnd Resources"; license = licenses.mit; homepage = "https://github.com/LN-Zap/lndconnect"; - maintainers = [ maintainers.xwvvvvwx ]; + maintainers = [ maintainers.d-xo ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth/default.nix index b1548212a6..58c0b45337 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://github.com/ledgerwatch/turbo-geth/"; description = "Ethereum node and geth fork focused on scalability and modularity"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix index 8894707643..37ede94fa1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"; + sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix index c7cb8be2fa..c10a436b73 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "micro"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8QtucdamxVwHuuhQhVQuvTNbqY5p97LKSB23617p4ow="; + sha256 = "sha256-hVFmViwGXuYVAKaCkzK/LHjCi8AtLu0tsPpT61glxys="; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - vendorSha256 = "sha256-bkD125ePdKcVgmNilOMZgUK6A8KWxaBOGKs8AvvIboI="; + vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 3ed11aa8b7..b32dd4c8fe 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.7"; + version = "3.16.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p"; + sha256 = "sha256-Y9WVgKEMOSMaXxfC9EQ8yqBYEj4XNL7YdMp8vjV55d0="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix index 96429d6f1e..bea8aed3fb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; rev = "v${version}"; - sha256 = "1zbb2bsc6v2rwrbigbkgrzfjmlj96s3ri73zbdcyqg4p08v1w4l6"; + sha256 = "sha256-2GhpxajymLVAl2P6vZ0+nuZK3ZRRktFswWkj7TP8eHI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix index e9488b845f..04150a1ceb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -56,13 +56,13 @@ assert builtins.all stdenv.mkDerivation rec { pname = "imv"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; rev = "v${version}"; - sha256 = "07pcpppmfvvj0czfvp1cyq03ha0jdj4whl13lzvw37q3vpxs5qqh"; + sha256 = "sha256-HP9W9US9e3YAXwCqiHV8NVqrO20SfQKcW3a6+r1XrIs="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix index 3b32f0d7f3..6b09a2e38d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; - phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' tar -zxf $src ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index bd3194e3fe..40339b49e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; + sha256 = "sha256-Oci1y6//45Gep4IS6Ym+v9MPCP5mOswAiWPkXqd+zR0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix index 14b372d91e..61cab2b6a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/avrdudess/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; - phases = [ "buildPhase" ]; + dontUnpack = true; + dontInstall = true; buildPhase = '' mkdir -p "$out/avrdudess" diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix index 56894a29a6..fca1ad12fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { at-spi2-atk ]; - phases = "unpackPhase fixupPhase"; + dontInstall = true; # change this to azuredatastudio-insiders for insiders releases edition = "azuredatastudio"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index daef73a567..7458377d42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.39"; + version = "0.99.40"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE="; + sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix index a3919648f7..7ff20b16d7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix @@ -29,13 +29,13 @@ with lib; stdenv.mkDerivation rec { pname = "elogind"; - version = "243.7"; + version = "246.10"; src = fetchFromGitHub { owner = "elogind"; repo = pname; rev = "v${version}"; - sha256 = "0cihdf7blhncm2359qxli24j9l3dkn15gjys5vpjwny80zlym5ma"; + sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/emem/default.nix b/third_party/nixpkgs/pkgs/applications/misc/emem/default.nix index ab718cdffc..f82ce53d97 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/emem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/emem/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "18x3s3jrph8k3pc75jgwkfqazygpsx93zjxx68zms58my17cybh1"; }; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' mkdir -p $out/bin $out/share/java diff --git a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix new file mode 100644 index 0000000000..4c2e262c9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitea +, pkg-config +, meson +, ninja +, scdoc +, wayland-protocols +, tllist +, fontconfig +, freetype +, pixman +, libpng +, wayland +, wlroots +, dbus +, fcft +}: + +stdenv.mkDerivation rec { + pname = "fnott"; + version = "1.1.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fnott"; + rev = version; + sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + scdoc + wayland-protocols + tllist + ]; + buildInputs = [ + fontconfig + freetype + pixman + libpng + wayland + wlroots + dbus + fcft + ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/fnott"; + description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors."; + license = licenses.mit; + maintainers = with maintainers; [ polykernel ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index daf5beb2fa..e43304c5bc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -1,22 +1,75 @@ -{ stdenv, lib, fetchzip, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: +{ stdenv +, lib +, fetchFromGitea +, pkg-config +, meson +, ninja +, wayland-scanner +, wayland +, pixman +, wayland-protocols +, libxkbcommon +, scdoc +, tllist +, fcft +, enableCairo ? true +, enablePNG ? true +, enableSVG ? true +# Optional dependencies +, cairo +, librsvg +, libpng +}: + +let + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; +in stdenv.mkDerivation rec { pname = "fuzzel"; version = "1.6.1"; - src = fetchzip { - url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fuzzel"; + rev = version; sha256 = "sha256-JW5sAlTprSRIdFbmSaUreGtNccERgQMGEW+WCSscYQk="; }; - nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; - buildInputs = [ wayland pixman cairo librsvg wayland-protocols wlroots libxkbcommon tllist fcft ]; + nativeBuildInputs = [ + pkg-config + wayland-scanner + meson + ninja + scdoc + ]; + + buildInputs = [ + wayland + pixman + wayland-protocols + libxkbcommon + tllist + fcft + ] ++ lib.optional enableCairo cairo + ++ lib.optional enablePNG libpng + ++ lib.optional enableSVG librsvg; + + mesonBuildType = "release"; + + mesonFlags = [ + (mesonFeatureFlag "enable-cairo" enableCairo) + (mesonFeatureFlag "enable-png" enablePNG) + (mesonFeatureFlag "enable-svg" enableSVG) + ]; meta = with lib; { description = "Wayland-native application launcher, similar to rofi’s drun mode"; homepage = "https://codeberg.org/dnkl/fuzzel"; license = licenses.mit; - maintainers = with maintainers; [ fionera ]; + maintainers = with maintainers; [ fionera polykernel ]; platforms = with platforms; linux; changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index 2b4504a1dc..76a19f5188 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = let desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix index 59bb05f85c..cc9f9df0c6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix index 7c54c32011..5c9a507fc0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "example-unfree-package"; version = "1.0"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 527c2f3bab..a5a9c3e45f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -55,7 +55,8 @@ let install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace 'Exec=AppRun' 'Exec=${pname}' \ + --replace 'Icon=joplin' "Icon=$out/share/pixmaps/@joplinapp-desktop.png" ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index 843193bba1..336bd5a7f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.46"; + version = "2.48.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy"; + sha256 = "sha256-HkAgKPvf8TUgUlgsGWVgjuYJaRPGi8obOFQEtmzDtLE="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index 1840804ce7..43e3014db3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.12"; + version = "0.10.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-srivjGnrEizLvph7AP/02dOsnMyTnL3a6f0xm8oGML4="; + sha256 = "04kq86qmrjbzidrkknj000pv1b5z0r7nfidhy2zv67ks8fdi4zln"; name = "${pname}-${version}.tar.xz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix index 71bab08960..d220d5fa2f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,16 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.13"; + version = "2.3.14"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - rev = "release/${version}"; - sha256 = "sha256-Bi/Cz2T2NdtnJZHav8qvo+gErPsR8Ym7K3KcD5APt6Y="; + # 2.3.14 release tag points to the commit before the one that updates the + # version number. + # rev = "release/${version}"; + rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf"; + sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92"; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; @@ -41,7 +44,7 @@ mkDerivation rec { running radio simulators. ''; homepage = "https://www.open-tx.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ elitak lopsided98 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rtv/default.nix deleted file mode 100644 index be539a37a3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/rtv/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -with python3Packages; -buildPythonApplication rec { - version = "1.27.0"; - pname = "rtv"; - - src = fetchFromGitHub { - owner = "michael-lazar"; - repo = "rtv"; - rev = "v${version}"; - sha256 = "1hw7xy2kjxq7y3wcibcz4l7zj8icvigialqr17l362xry0y17y5j"; - }; - - # Tests try to access network - doCheck = false; - - checkPhase = '' - py.test - ''; - - checkInputs = [ - coverage - coveralls - docopt - mock - pylint - pytest - vcrpy - ]; - - propagatedBuildInputs = [ - beautifulsoup4 - decorator - kitchen - requests - six - ]; - - meta = with lib; { - homepage = "https://github.com/michael-lazar/rtv"; - description = "Browse Reddit from your Terminal"; - license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer wedens ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/smos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/smos/default.nix index 7d994a749b..aa2f53b5a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/smos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/smos/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "smos-${version}"; + pname = "smos"; version = "0.1.0"; src = fetchurl { @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:07yavk7xl92yjwwjdig90yq421n8ldv4fjfw7izd4hfpzw849a12"; }; - phases = [ "unpackPhase" ]; + dontInstall = true; + unpackCmd = "${unzip}/bin/unzip -d $out $curSrc"; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index 4901eda54a..2e811fa884 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.20"; + version = "0.0.26"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "03jiv5m807z96796fbpi6ny22am3sq4jfni37fxbld05sxdzwcnd"; + sha256 = "1d4n55p9hl4c8i2yz3gq3r7kma7j32pr976dhd7xdwhxadvn3aal"; }; - vendorSha256 = "1in5b7ixnm5iizkzziqclvgaq87ccdh507amkgfhfy5sxsgbfb1g"; + vendorSha256 = "1zmwfgl1mayqcqk93368l94d6yah1qb0x11vf9b2x7zbzxzfshg9"; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index 8ab143ac54..220ca6a4e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "usql"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU="; + sha256 = "sha256-vLGoPttl7f4qCVM8e0F0llIODuNqJ7GxXqbUgokv7Qw="; }; - vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus="; + vendorSha256 = "sha256-sGECp1L6WzIPGbQbBoV1IrTgyy4/c95OLAmj9D0FjXs="; buildInputs = [ unixODBC icu ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix index 4f385ef217..57a1f55392 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wbg/default.nix @@ -1,50 +1,64 @@ { stdenv , lib -, fetchgit +, fetchFromGitea +, pkg-config , meson , ninja -, pkg-config -, git -, scdoc -, cairo -, fcft -, libpng -, librsvg -, libxkbcommon , pixman , tllist , wayland +, wayland-scanner , wayland-protocols -, wlroots +, enablePNG ? true +, enableJPEG ? true +# Optional dependencies +, libpng +, libjpeg }: +let + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; +in + stdenv.mkDerivation rec { pname = "wbg"; - version = "unstable-2020-08-01"; + version = "1.0.2"; - src = fetchgit { - url = "https://codeberg.org/dnkl/wbg"; - rev = "1b05bd80d0f40e3ba1e977002d0653f532649269"; - sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "wbg"; + rev = version; + sha256 = "sha256-PKEOWRcSAB4Uv5TfameQIEZh6s6xCGdyoZ13etL1TKA="; }; - nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + buildInputs = [ - cairo - fcft - libpng - librsvg - libxkbcommon pixman tllist wayland wayland-protocols - wlroots + ] ++ lib.optional enablePNG libpng + ++ lib.optional enableJPEG libjpeg; + + mesonBuildType = "release"; + + mesonFlags = [ + (mesonFeatureFlag "png" enablePNG) + (mesonFeatureFlag "jpeg" enableJPEG) ]; meta = with lib; { description = "Wallpaper application for Wayland compositors"; homepage = "https://codeberg.org/dnkl/wbg"; + changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix index 5f38d405cb..50faa50c0e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -17,12 +17,12 @@ buildGoModule rec { preBuild = '' make assets - export buildFlagsArray=( - "-ldflags=-s -w -X github.com/writeas/writefreely.softwareVer=${version}" - "-tags='sqlite'" - ) ''; + ldflags = [ "-s" "-w" "-X github.com/writeas/writefreely.softwareVer=${version}" ]; + + tags = [ "sqlite" ]; + subPackages = [ "cmd/writefreely" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix index 933f352e5e..db2f0579d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchFromGitea , pkg-config , meson , ninja @@ -9,50 +9,75 @@ , fcft , json_c , libmpdclient -, libxcb , libyaml , pixman , tllist , udev , wayland +, wayland-scanner , wayland-protocols +, waylandSupport ? false +# Xorg backend +, libxcb , xcbutil , xcbutilcursor , xcbutilerrors , xcbutilwm }: +let + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; +in + stdenv.mkDerivation rec { pname = "yambar"; version = "1.6.2"; - src = fetchgit { - url = "https://codeberg.org/dnkl/yambar.git"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "yambar"; rev = version; - sha256 = "sha256-oUNkaWrYIcsK2u+aeRg6DHmH4M1VZ0leNSM0lV9Yy1Y="; + sha256 = "sha256-GPKR2BYl3ebxxXbVfH/oZLs7639EYwWU4ZsilJn0Ss8="; }; - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + scdoc + wayland-scanner + ]; + buildInputs = [ alsa-lib fcft json_c libmpdclient - libxcb libyaml pixman tllist udev wayland wayland-protocols + ] ++ lib.optionals (!waylandSupport) [ xcbutil xcbutilcursor xcbutilerrors xcbutilwm ]; + mesonBuildType = "release"; + + mesonFlags = [ + (mesonFeatureFlag "backend-x11" (!waylandSupport)) + (mesonFeatureFlag "backend-wayland" waylandSupport) + ]; + meta = with lib; { homepage = "https://codeberg.org/dnkl/yambar"; + changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${version}"; description = "Modular status panel for X11 and Wayland"; longDescription = '' yambar is a lightweight and configurable status panel (bar, for short) for diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index d669b97c44..d51515c597 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "unstable-2021-07-14"; + version = "0.14.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; - # unstable because the latest release fails to build - rev = "312ffcb04c06c5f157b9fd2b944b858703238592"; - sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w"; + rev = "v${version}"; + sha256 = "1mvin6pfqhsfhaifivbdi6qcn0dsa98w83m1n51q807gh4l1k2yj"; }; - cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8"; + cargoSha256 = "02bk399c7x15a5rkaz7ik65yihkfbjn1q46gx7l8hycqq7xb0xmg"; nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] @@ -30,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast static site generator with everything built-in"; homepage = "https://www.getzola.org/"; + changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dandellion dywedir _0x4A6F ]; # set because of unstable-* version diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 9f4923a7ec..a1442cfb3e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -201,7 +201,6 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; - timeout = 86400; # 24 hours (increased from the Hydra default of 10h, c.f. #129115) maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 3aa0eeece9..109c757c15 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -21,6 +21,7 @@ rec { badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; }; tests = [ nixosTests.firefox ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 202821b097..c868369b60 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -49,6 +49,8 @@ let gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards + smartcardSupport = cfg.smartcardSupport or false; nativeMessagingHosts = ([ ] @@ -70,6 +72,7 @@ let (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib + ++ lib.optional smartcardSupport opensc ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; @@ -120,6 +123,10 @@ let ret ++ [ "${e.outPath}/${e.extid}.xpi" ] ) [] extensions; }; + } // lib.optionalAttrs smartcardSupport { + SecurityDevices = { + "OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so"; + }; } // extraPolicies; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index f15cf6c81b..9f3a27e22b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -4,6 +4,8 @@ , nix-update-script , cmake , pkg-config +, fribidi +, harfbuzz , libunistring , mpg123 , openssl @@ -15,27 +17,36 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.5.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI="; + sha256 = "sha256-YTWVBQt0X12UDFJv/rPBqlIBC4iXSvpdYi/HIl+BPxc="; fetchSubmodules = true; }; + postPatch = '' + rm -r lib/fribidi lib/harfbuzz + ''; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ fribidi harfbuzz libunistring mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; - installPhase = if stdenv.isDarwin then '' + cmakeFlags = [ + "-DENABLE_HARFBUZZ_MINIMAL:BOOL=OFF" + "-DENABLE_FRIBIDI_BUILD:BOOL=OFF" + ]; + + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv Lagrange.app $out/Applications - '' else null; + ''; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix index 713f934f77..e2d6854295 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,11 +1,16 @@ -{ lib, stdenv, buildPackages -, fetchurl, pkg-config, ncurses, gzip -, sslSupport ? true, openssl ? null +{ lib +, stdenv +, buildPackages +, fetchurl +, pkg-config +, ncurses +, gzip +, sslSupport ? true +, openssl , nukeReferences +, fetchpatch }: -assert sslSupport -> openssl != null; - stdenv.mkDerivation rec { pname = "lynx"; version = "2.8.9rel.1"; @@ -22,6 +27,14 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-38165.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/lynx/CVE-2021-38165.patch?id=3400945dbbb8a87065360963e4caa0e17d3dcc61"; + sha256 = "1aykb9y2g2vdpbbpvjlm4r40x7py2yv6jbywwcqcxrlciqcw4x57"; + }) + ]; + configureFlags = [ "--enable-default-colors" "--enable-widec" @@ -32,7 +45,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nukeReferences ] ++ lib.optional sslSupport pkg-config; - buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev; + buildInputs = [ ncurses gzip ] + ++ lib.optional sslSupport openssl; # cfg_defs.h captures lots of references to build-only dependencies, derived # from config.cache. @@ -44,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 9026738133..61e2063f2c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.7.4"; + version = "2021.8.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-3HK7QLUhU6MUayRYec4LP2BfbwEsvtjtCf++o1cQsQw="; + sha256 = "sha256-92Uq7hSqfsiES6dSCw4cotfLJ8TLRRO6QPkwQ8iv124="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index baf67f2b68..eb55e3f9aa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.1"; + version = "0.16.2"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig="; + sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA="; }; - vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k="; + vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix new file mode 100644 index 0000000000..c436597571 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "chart-testing"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "helm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-c7Rjk2YZaQXyFwrDVwYgOCnq/F2ooIUVETXVn5FVlZE="; + }; + + vendorSha256 = "sha256-1Py66ljDjJC38biJ25D8KnWEi3nXAVt9QSgyH1KkwHM="; + + postPatch = '' + substituteInPlace pkg/config/config.go \ + --replace "\"/etc/ct\"," "\"$out/etc/ct\"," + ''; + + ldflags = [ + "-w" + "-s" + "-X github.com/helm/chart-testing/v3/ct/cmd.Version=${version}" + "-X github.com/helm/chart-testing/v3/ct/cmd.GitCommit=${src.rev}" + "-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00" + ]; + + postInstall = '' + install -Dm644 -t $out/etc/ct etc/chart_schema.yaml + install -Dm644 -t $out/etc/ct etc/lintconf.yaml + ''; + + meta = with lib; { + description = "A tool for testing Helm charts"; + homepage = "https://github.com/helm/chart-testing"; + license = licenses.asl20; + maintainers = with maintainers; [ atkinschang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 89d07da748..3c7b232cc2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.14"; + version = "0.24.15"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; + sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; + vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index 577e52ed49..be91a64b74 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE="; + sha256 = "sha256-gJAdxg/evsQ+mKsNx/migDMK5lCZ2qSrksbsGDr4fmU="; }; - vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w="; + vendorSha256 = "sha256-GvkT51JudEdPz6zbqyf5qY6P2AbsaSMbirnxXmza5aI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index d123790edd..5784c2a472 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, installShellFiles , makeWrapper , git , go @@ -15,11 +14,11 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a"; + sha256 = "0bl5ff2cplal6hg75800crhyviamk1ws85sq60h4zg21hzf21y68"; }; vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; - subPackages = ["cmd" "pkg/..."]; + subPackages = ["cmd"]; preBuild = '' export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index e53a9c39ea..0d23e94879 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -28,11 +28,9 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ systemd ]; - buildFlags = "-mod vendor" + - lib.optionalString stdenv.isLinux " -tags journald"; + tags = lib.optionals stdenv.isLinux [ "journald" ]; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X k8s.io/${pname}/pkg/version.version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 589164e276..66e80f6648 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.1"; + version = "0.31.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas="; + sha256 = "sha256-I7S7B+mQxLdMWiLAkUIW39kXGU9k647OOhHysYotkfU="; }; - vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A="; + vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gftp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gftp/default.nix new file mode 100644 index 0000000000..947a75d0e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/gftp/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, gettext +, gtk +, intltool +, libtool +, ncurses +, openssl +, pkg-config +, readline +}: + +stdenv.mkDerivation rec { + pname = "gftp"; + version = "2.7.0b"; + + src = fetchFromGitHub { + owner = "masneyb"; + repo = pname; + rev = version; + hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog="; + }; + + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkg-config + ]; + buildInputs = [ + gtk + ncurses + openssl + readline + ]; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with lib; { + homepage = "https://github.com/masneyb/gftp"; + description = "GTK-based multithreaded FTP client for *nix-based machines"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: report the hardeningDisable to upstream diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 74a4ab968c..ced3dcf5fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -15,6 +15,7 @@ , enableSpelling ? true, gspell , enableUPnP ? true, gupnp-igd , enableOmemoPluginDependencies ? true +, enableAppIndicator ? true, libappindicator-gtk3 , extraPythonPackages ? ps: [] }: @@ -33,7 +34,8 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell - ++ lib.optional enableUPnP gupnp-igd; + ++ lib.optional enableUPnP gupnp-igd + ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ gettext wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/networking/insync/v3.nix b/third_party/nixpkgs/pkgs/applications/networking/insync/v3.nix index ad202871b9..49a5b89211 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/insync/v3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/insync/v3.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "insync"; - version = "3.2.4.40856"; + version = "3.3.5.40925"; src = fetchurl { url = "http://s.insynchq.com/builds/${pname}_${version}-focal_amd64.deb"; - sha256 = "1bvqbbrfn5784nmb2qaflm1rzczqhvghhb6y5zaxrapyhygxbcis"; + sha256 = "sha256-lYlG/8d7teX98F5eDxm4EdBfFs7Sz3Td4kKLC6KZqnQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index 08e8d6a00b..c9637fef4c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , rustPlatform -, fetchpatch , fetchFromGitHub , pkg-config , dbus @@ -11,23 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7"; + sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE="; }; - cargoSha256 = "0npkcprcqy2pn7k64jzwg41vk9id6yzw211xw203h80cc5444igr"; + cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws="; + # Fix Cargo.lock version. Remove with the next release. cargoPatches = [ - # Fix Cargo.lock version. Remove with the next release. - (fetchpatch { - url = "https://github.com/osa1/tiny/commit/b1caf48a6399dad8875de1d965d1ad445e49585d.patch"; - sha256 = "1zkjhx94nwmd69cfwwwzg51ipcwq01wyvgsmn0vq7iaa2h0d286i"; - }) + ./fix-Cargo.lock.patch ]; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; @@ -38,6 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/osa1/tiny"; changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne vyp ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch new file mode 100644 index 0000000000..71bc4709be --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3a184dc..0e58cb1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1023,7 +1023,7 @@ dependencies = [ + + [[package]] + name = "tiny" +-version = "0.8.0" ++version = "0.9.0" + dependencies = [ + "clap", + "dirs 3.0.1", diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix index e82680e36b..dce623897f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.9"; + version = "2.9.10"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU="; + sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk="; }; - vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0="; + vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index ad43ed97e0..7792361145 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.1"; + version = "3.40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50"; + sha256 = "ZAIE5rpPOyZT3VSPYOR143bP8Na7Kv0NQRhQ+p2oxJY="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 2991550def..0f7a806ed8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -with lib; - stdenv.mkDerivation rec { - version = "6.8.9"; + version = "6.9.4"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q"; + sha256 = "sha256-sWvQDUJGytKA9/UbC7fOk6WhDtTqdhyRmW9GvHFMZh4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index e1697e2626..b2eb18bd7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,13 @@ let pname = "pcloud"; - version = "1.9.3"; - code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy"; + version = "1.9.5"; + code = "XZy4VwXZjkvoMGM3x6kCTkIGLFYVKjqKbefX"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU="; + hash = "sha256-GuO4wsSRT6WMlqYs2X+5oA7CykHb/NmhZ7UGA1FA6y4="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 4b1a0bed04..6e19fb60f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -23,8 +23,9 @@ buildGoModule rec { buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse); nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildFlagsArray = lib.optionals enableCmount [ "-tags=cmount" ] - ++ [ "-ldflags=-s -w -X github.com/rclone/rclone/fs.Version=${version}" ]; + tags = lib.optionals enableCmount [ "cmount" ]; + + ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ]; postInstall = let diff --git a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix index 8c1245a99a..63d38b0cc3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.5.0"; + version = "9.6.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "sha256-EAoydA2lg4K1gTgzn9patNw7pcCdU/OPfaEG1OfEJ18="; + sha256 = "sha256-55ydhprVC9NdDMUrKbpSAEQBb9zRYgwOc7k8aP4R89A="; }; tools = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix b/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix index 9dbdae3f02..97edd9e1fa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.6"; + version = "2021.2.1"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja"; + sha256 = "sha256-WorRyfjWucV8UhAjvuW+22CRzPcz5tjXF7Has4wrLMI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix index 1d2d6f0d85..f370d94d1c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs="; + sha256 = "sha256-bCO82EWAf/kiMDdojA5goWeWiKWZNOGYixmIJQwovGM="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix index ebc93edba6..2a97de6ca5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -1,21 +1,34 @@ { lib +, stdenv +, fetchpatch , python3Packages , wrapGAppsHook , gtk3 , gobject-introspection , libcanberra-gtk3 , poppler_gi +, withGstreamer ? stdenv.isLinux +, withVLC ? stdenv.isLinux }: python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.5.1"; + version = "1.6.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "173d9scf2z29qg279jf33zcl7sgc3wp662fgpm943bn9667q18wf"; + sha256 = "sha256-f+OjE0x/3yfJYHCLB+on7TT7MJ2vNu87SHRi67qFDCM="; }; + patches = [ + # Should not be needed once v1.6.4 is released + (fetchpatch { + name = "fix-setuptools-version-parsing.patch"; + url = "https://github.com/Cimbali/pympress/commit/474514d71396ac065e210fd846e07ed1139602d0.diff"; + sha256 = "sha256-eiw54sjMrXrNrhtkAXxiSTatzoA0NDA03L+HpTDax58="; + }) + ]; + nativeBuildInputs = [ wrapGAppsHook ]; @@ -23,16 +36,15 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - libcanberra-gtk3 poppler_gi - ]; + ] ++ lib.optional withGstreamer libcanberra-gtk3; propagatedBuildInputs = with python3Packages; [ pycairo pygobject3 - python-vlc + setuptools watchdog - ]; + ] ++ lib.optional withVLC python-vlc; doCheck = false; # there are no tests diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index c27f0915a4..0de04e26ff 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.19"; + version = "4.1.20"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0zvfkmvxi31ccbpxvimkcrqrkf3wzr1pgja2ny04srrakl8ff5c7"; + sha256 = "0f64pqijl3jlfmv00hkdxvn1wy5yy3zl33p6vf3fn1b91w590c2h"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix index b0983c811e..e762dbe657 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fllog/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.7"; pname = "fllog"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg"; + sha256 = "sha256-HxToZ+f1IJgDKGPHBeVuS7rRkh3+KfpyoYPBwfyqsC8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index 205ff9afdc..818d0fe14b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib, python3, perl }: stdenv.mkDerivation rec { pname = "bowtie2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ tbb zlib ]; + buildInputs = [ tbb zlib python3 perl ]; meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro2/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro2/default.nix new file mode 100644 index 0000000000..437123faaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen, avogadrolibs, molequeue, hdf5 +, openbabel, qttools, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "avogadro2"; + version = "1.94.0"; + + src = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "avogadroapp"; + rev = version; + sha256 = "6RaiX23YUMfTYAuSighcLGGlJtqeydNgi3PWGF77Jp8="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ + avogadrolibs + molequeue + eigen + hdf5 + qttools + ]; + + propagatedBuildInputs = [ openbabel ]; + + qtWrapperArgs = [ "--prefix PATH : ${openbabel}/bin" ]; + + meta = with lib; { + description = "Molecule editor and visualizer"; + maintainers = with maintainers; [ sheepforce ]; + homepage = "https://github.com/OpenChemistry/avogadroapp"; + platforms = platforms.mesaPlatforms; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix index 060909bdcb..3e701dc93c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/lepton-eda/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "lepton-eda"; - version = "1.9.13-20201211"; + version = "1.9.16-20210731"; src = fetchurl { url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz"; - sha256 = "sha256-9Be3FBWnZU2M5aNQwi3N8M81e0S7n46mwWQh1mrK4Z8="; + sha256 = "sha256-xdJ11M4RXNF6ePZD6Y+/DUdO21AFLbydZcq9nWg0+Yk="; }; nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix index adce305510..f0dd990a35 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -4,6 +4,7 @@ , bison , flex , verilog +, which }: stdenv.mkDerivation rec { @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex + which ]; buildInputs = [ @@ -36,8 +38,9 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/bin - cp src/vhd2vl $out/bin/ + runHook preInstall + install -D -m755 src/vhd2vl $out/bin/vdh2vl + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix index b1abb31c76..9566801479 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -1,27 +1,32 @@ { lib, stdenv, fetchurl -, ninja, libxml2, libxslt, readline, perl, gmp, mpfr, boost +, perl, gmp, mpfr, flint, boost , bliss, ppl, singular, cddlib, lrs, nauty -, ant, openjdk +, ninja, ant, openjdk , perlPackages , makeWrapper }: +# polymake compiles its own version of sympol and atint because we +# don't have those packages. other missing optional dependencies: +# javaview, libnormaliz, scip, soplex, jreality. + stdenv.mkDerivation rec { pname = "polymake"; - version = "3.2.rc4"; + version = "4.4"; src = fetchurl { - url = "https://polymake.org/lib/exe/fetch.php/download/polymake-3.2r4.tar.bz2"; - sha256 = "02jpkvy1cc6kc23vkn7nkndzr40fq1gkb3v257bwyi1h5d37fyqy"; + # "The minimal version is a packager friendly version which omits + # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." + url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; + sha256 = "sha256-2nF5F2xznI77pl2TslrxA8HLpw4fmzVnPOM8N3kOwJE="; }; buildInputs = [ - libxml2 libxslt readline perl gmp mpfr boost + perl gmp mpfr flint boost bliss ppl singular cddlib lrs nauty openjdk - ] ++ - (with perlPackages; [ - XMLLibXML XMLLibXSLT XMLWriter TermReadLineGnu TermReadKey + ] ++ (with perlPackages; [ + JSON TermReadLineGnu TermReadKey XMLSAX ]); nativeBuildInputs = [ @@ -36,11 +41,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with lib; { description = "Software for research in polyhedral geometry"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + platforms = platforms.linux; homepage = "https://www.polymake.org/doku.php"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix new file mode 100644 index 0000000000..21e3c47b32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix @@ -0,0 +1,41 @@ +{ lib +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "cwltool"; + version = "3.1.20210628163208"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "21b885f725420413d2f87eadc5e81c08a9c91beceda89b35d1a702ec4df47e52"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'prov == 1.5.1' 'prov' + ''; + + propagatedBuildInputs = with python3Packages; [ + argcomplete + bagit + coloredlogs + mypy-extensions + prov + psutil + pydot + schema-salad + shellescape + typing-extensions + ]; + + doCheck = false; # hard to setup + pythonImportsCheck = [ "cwltool" ]; + + meta = with lib; { + homepage = "https://www.commonwl.org"; + license = with licenses; [ asl20 ]; + description = "Common Workflow Language reference implementation"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index a5740fc45b..8f8a074cc5 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchzip +, fetchFromGitea , fetchurl , fetchpatch , runCommandNoCC @@ -94,8 +94,11 @@ stdenv.mkDerivation rec { pname = "foot"; inherit version; - src = fetchzip { - url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = pname; + rev = version; sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; }; @@ -147,8 +150,9 @@ stdenv.mkDerivation rec { export AR="${ar}" ''; + mesonBuildType = "release"; + mesonFlags = [ - "--buildtype=release" "-Db_lto=true" "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index defad82d5a..28020f8536 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghq"; - version = "1.1.7"; + version = "1.2.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-kEs844gj1/PW7Kkpn1tvxfruznRIh2pjHCoSWGF1upQ="; + sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4="; }; vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 8c7ecee047..83397d1934 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "sociomantic-tsunami"; repo = "git-hub"; rev = "v${version}"; - sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7"; + sha256 = "sha256-k8sGgDhQn9e0lxM604Wz2sy4lrX5o82xAgWbqscOmQw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index e2314687d8..e91192d53d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -58,7 +58,7 @@ appimageTools.wrapType2 { description = "A decentralized app for code collaboration"; homepage = "https://radicle.xyz/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix index c0b0021f8c..f7b7305b10 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -29,9 +29,7 @@ buildGoModule rec { buildInputs = optional pamSupport pam; - buildFlags = [ "-tags" ]; - - buildFlagsArray = + tags = ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix index e4225963cb..4b285cfc00 100644 --- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "catt"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "fef58bf7a8ebaba98399d1077cc4615f53d0196aab2a989df369a66f7111963b"; + sha256 = "sha256-BOETKTkcbLOu5SubiejswU7D47qWS13QZ7rU9x3jf5Y="; }; propagatedBuildInputs = [ @@ -19,6 +19,14 @@ buildPythonApplication rec { youtube-dl ]; + # remove click when 0.12.3 is released + # upstream doesn't use zeroconf directly but pins it for pychromecast + postPatch = '' + substituteInPlace setup.py \ + --replace "zeroconf==0.31.0" "" \ + --replace "Click>=7.1.2,<8" "click" + ''; + doCheck = false; # attempts to access various URLs pythonImportsCheck = [ "catt" ]; @@ -29,4 +37,3 @@ buildPythonApplication rec { maintainers = with maintainers; [ dtzWill ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix index d691882a2c..727541e3b5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix @@ -1,6 +1,8 @@ { lib , mkDerivationWith , python3Packages +, fetchFromGitHub +, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -8,36 +10,41 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.0"; + version = "0.7.1"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s"; + src = fetchFromGitHub { + owner = "corrscope"; + repo = "corrscope"; + rev = version; + sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \ - --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0' - ''; + format = "pyproject"; - nativeBuildInputs = [ wrapQtAppsHook ]; + patches = [ + # Remove when bumping past 0.7.1 + (fetchpatch { + name = "0001-Use-poetry-core.patch"; + url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; + sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; + }) + ]; + + nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ poetry-core ]); buildInputs = [ ffmpeg qtbase ]; - propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel_yaml ]; dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=( - --prefix PATH : ${ffmpeg}/bin + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} "''${qtWrapperArgs[@]}" ) ''; - preCheck = "export HOME=$TEMP"; - meta = with lib; { description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix index 92c15fea9a..a32228176c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY="; + sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o="; }; unpackPhase = "tar xvf $src"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests-cache/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests-cache/default.nix new file mode 100644 index 0000000000..de785ab9bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests-cache/default.nix @@ -0,0 +1,29 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +buildKodiAddon rec { + pname = "requests-cache"; + namespace = "script.module.requests-cache"; + version = "0.5.2+matrix.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "0fgl4jayq6hbhqxg16nfy9qizwf54c8nvg0icv93knaj13zfzkz8"; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.requests-cache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/reclosedev/requests-cache"; + description = "Persistent cache for requests library"; + license = licenses.bsd2; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/routing/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/routing/default.nix new file mode 100644 index 0000000000..a75e786cf1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/routing/default.nix @@ -0,0 +1,25 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +buildKodiAddon rec { + pname = "routing"; + namespace = "script.module.routing"; + version = "0.2.3+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "1qhp40xd8mbcvzwlamqw1j5l224ry086593948g24drpqiiyc8x6"; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.routing"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/tamland/kodi-plugin-routing"; + description = "A routing module for kodi plugins"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-library/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-library/default.nix new file mode 100644 index 0000000000..5660be9498 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-library/default.nix @@ -0,0 +1,27 @@ +{ lib, buildKodiAddon, fetchFromGitHub, requests, requests-cache, routing }: + +buildKodiAddon rec { + pname = "steam-library"; + namespace = "plugin.program.steam.library"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "aanderse"; + repo = namespace; + rev = "v${version}"; + sha256 = "1d8n8zkprjql0nw5ff752yr994hw2ikd0ny3m9hjr90s4kdykjzr"; + }; + + propagatedBuildInputs = [ + requests + requests-cache + routing + ]; + + meta = with lib; { + homepage = "https://github.com/aanderse/plugin.program.steam.library"; + description = "View your entire Steam library right from Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix index a54411eca9..5f3b31870d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix @@ -23,13 +23,14 @@ stdenv.mkDerivation rec { version = "2.7"; src = fetchurl { - url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo="; }; nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl + libtool pkg-config ]; buildInputs = [ @@ -37,7 +38,6 @@ stdenv.mkDerivation rec { curl gtk2 libGL - libtool libGLU libX11 libXpm @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { }; } # TODO: a better way to organize the options -# TODO: docbook (install docbook-tools from RedHat mirrors can help) +# TODO: docbook (docbook-tools from RedHat mirrors should help) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 09ba9a7518..6e6db87a6c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.36.1"; + version = "1.36.2"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-BoBZBzQYd/HbOCerpvcNcR/7Fds6+weY2QFRjqSfOjU="; + sha256 = "sha256-Q8M8+krPC6WRDCxe88gzX5bDG8x6sJ8TduTKjA85WFA="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/default.nix new file mode 100644 index 0000000000..264d5a41bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenvNoCC, fetchurl, cabextract }: + +stdenvNoCC.mkDerivation { + pname = "vista-fonts-cht"; + version = "1"; + + src = fetchurl { + url = https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE; + sha256 = "sha256-fSnbbxlMPzbhFSQyKxQaS5paiWji8njK7tS8Eppsj6g="; + }; + + nativeBuildInputs = [ cabextract ]; + + unpackPhase = '' + cabextract --lowercase --filter '*.TTF' $src + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + # Set up no-op font configs to override any aliases set up by + # other packages. + mkdir -p $out/etc/fonts/conf.d + substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-msjhenghei.conf \ + --subst-var-by fontname "Microsoft JhengHei" + ''; + + + meta = with lib; { + description = "TrueType fonts from Microsoft Windows Vista For Traditional Chinese (Microsoft JhengHei)"; + homepage = "https://www.microsoft.com/typography/fonts/family.aspx"; + license = licenses.unfree; + maintainers = with maintainers; [ atkinschang ]; + + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/no-op.conf b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/no-op.conf new file mode 100644 index 0000000000..3f8a9b9b54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-cht/no-op.conf @@ -0,0 +1,9 @@ + + + + + diff --git a/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix index cf45152178..a979dca447 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix @@ -1,18 +1,18 @@ { lib, fetchzip }: let - version = "2.0.10"; + version = "2.0.12"; in fetchzip { name = "weather-icons-${version}"; - url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip"; + url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; + sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype ''; - sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl"; meta = with lib; { description = "Weather Icons"; diff --git a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index 9e50fb0c13..5c8f3d15b6 100644 --- a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-79C/M5WXQswA1xuA6pwVSRlDtQC9+EzkwSEV3SdPzBc="; + sha256 = "sha256-5tXXAfGY5JQ5RiKayUuQJDgX6sPHRi8Hy2ht/Hl0hdo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index d79fc73d61..beccf9dc77 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210505"; + version = "20210804"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-k0Bcf1I/g2sFnX3y4qyWG7Z3W7K6YeZ9trUFSJ4NhSo="; + sha256 = "sha256-+PTw4bDJhWyuEae5ShkIL/KvQ29+gU46iE2RdtTWb8M="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 81b45836a6..212c14e482 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7060a9c8a2b0e92be86d0338296697df3e9a713f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7060a9c8a2b0e92be86d0338296697df3e9a713f.tar.gz", - "sha256": "1dzdylg00j1rm8s0rs23jv22cvv9wy3abizzhnryq1wkp13npsc7", - "msg": "Update from Hackage at 2021-07-29T16:00:40Z" + "commit": "7818431b8d25dc7951cd7f50369741e9966d2dc8", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7818431b8d25dc7951cd7f50369741e9966d2dc8.tar.gz", + "sha256": "1fssc5r0482i03rcyvagql06p41qmr8vnyw6501zhbprvz0y1sd4", + "msg": "Update from Hackage at 2021-08-04T07:53:53Z" } diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index b63e9c06d2..f019009db9 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2021-06-09"; + version = "2021-06-25"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q="; + sha256 = "sha256-j0nsw1yR1yOckXiIMtzhC3w6kvfzxQQHgwdY6l0OuXw="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 96451d325b..37824495a1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "46"; + version = "47"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; + sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index 2397dd8ffc..7f3a6dc098 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -46,16 +46,13 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = [ + propagatedBuildInputs = [ glib + gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format" gtk3 libgee ]; - propagatedBuildInputs = [ - gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format" - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index d062c8605b..88aa7f3066 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "sha256-meqbFLGwCMpFoOVAfvtriRAS8ZWr374eSN3m0CdC2aM="; + sha256 = "sha256-XY6S1IvDqPxkYgFs7kB9AR0zQ4n3COVbS2lUT5mhTVc="; }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix new file mode 100644 index 0000000000..2fa280fc89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix @@ -0,0 +1,47 @@ +{ llvmPackages +, lib +, fetchFromGitHub +, cmake +, python3 +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "c3c"; + version = "unstable-2021-07-30"; + + src = fetchFromGitHub { + owner = "c3lang"; + repo = pname; + rev = "2246b641b16e581aec9059c8358858e10a548d94"; + sha256 = "VdMKdQsedDQCnsmTxO4HnBj5GH/EThspnotvrAscSqE="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.lld + ]; + + checkInputs = [ python3 ]; + + doCheck = true; + + checkPhase = '' + ( cd ../resources/testproject; ../../build/c3c build ) + ( cd ../test; python src/tester.py ../build/c3c test_suite ) + ''; + + installPhase = '' + install -Dm755 c3c $out/bin/c3c + cp -r lib $out + ''; + + meta = with lib; { + description = "Compiler for the C3 language"; + homepage = "https://github.com/c3lang/c3c"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix index 75687de4e9..1c40d7fe51 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake -, pkg-config - +, runCommandLocal , bison , flex , llvmPackages_8 @@ -46,18 +46,14 @@ stdenv.mkDerivation rec { doCheck = false; # Handholding the braindead build script - # We put this in a derivation because the cmake requires an absolute path - prebuilds = stdenv.mkDerivation { - name = "igc-cclang-prebuilds"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s clang $out/clang-${versions.major (getVersion clang)} - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ - ''; - }; + # cmake requires an absolute path + prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' + mkdir $out + ln -s ${clang}/bin/clang $out/ + ln -s clang $out/clang-${versions.major (getVersion clang)} + ln -s ${opencl-clang}/lib/* $out/ + ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/ + ''; cmakeFlags = [ "-DCCLANG_BUILD_PREBUILDS=ON" @@ -66,10 +62,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/intel/intel-graphics-compiler"; + homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; - license = licenses.mit; - platforms = platforms.all; + license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ gloaming ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix index cfafe43c3a..78c2831a2f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, src, cmake, libxml2, libllvm, version, python3 +{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -37,6 +37,10 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -52,12 +56,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch index f6f9336ad5..66742e5b14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/X86-support-extension.patch @@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 3a66dd9c3fb..7efc85d9f9f 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt -@@ -301,6 +301,10 @@ if (NOT MSVC) - i386/umoddi3.S - ) +@@ -345,4 +345,8 @@ if (NOT MSVC) + set(i486_SOURCES ${i386_SOURCES}) + set(i586_SOURCES ${i386_SOURCES}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 0000000000..425dc2af01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 8e258e349b..eb3446342b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix index 2dd6c46eb8..96d8b19ee4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix @@ -19,6 +19,7 @@ , Carbon , Cocoa , lit +, makeWrapper , enableManpages ? false }: @@ -42,7 +43,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -84,7 +85,15 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch index 98321f4479..afc945ce26 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch @@ -63,3 +63,29 @@ index 734167e51bc5..f95761b5df58 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") diff --git a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index 8cf709c10a..e7098abb60 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -1,12 +1,15 @@ { fetchurl, lib, stdenv, makeWrapper, gnum4, texinfo, texLive, automake, - enableX11 ? false, xlibsWrapper ? null }: + autoconf, libtool, ghostscript, ncurses, + enableX11 ? false, xlibsWrapper }: let - version = "10.1.10"; - bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); + version = "11.2"; + bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64); - arch = if stdenv.isi686 then "-i386" - else "-x86-64"; + arch = if stdenv.isLinux && stdenv.isAarch64 then + "-aarch64le" + else + "-x86-64"; in stdenv.mkDerivation { name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; @@ -16,49 +19,55 @@ stdenv.mkDerivation { # leads to more efficient code than when building the tarball that contains # generated C code instead of those binaries. src = - if stdenv.isi686 + if stdenv.isLinux && stdenv.isAarch64 then fetchurl { - url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "117lf06vcdbaa5432hwqnskpywc6x8ai0gj99h480a4wzkp3vhy6"; + url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz"; + sha256 = "11maixldk20wqb5js5p4imq221zz9nf27649v9pqkdf8fv7rnrs9"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1rljv6iddrbssm91c0nn08myj92af36hkix88cc6qwq38xsxs52g"; + sha256 = "17822hs9y07vcviv2af17p3va7qh79dird49nj50bwi9rz64ia3w"; }; - buildInputs = if enableX11 then [xlibsWrapper] else []; + buildInputs = [ ncurses ] ++ lib.optional enableX11 xlibsWrapper; - configurePhase = - '' (cd src && ./configure) - (cd doc && ./configure) - ''; + configurePhase = '' + runHook preConfigure + (cd src && ./configure) + (cd doc && ./configure) + runHook postConfigure + ''; - buildPhase = - '' cd src - ${if bootstrapFromC - then "./etc/make-liarc.sh --prefix=$out" - else "make compile-microcode"} + buildPhase = '' + runHook preBuild + cd src - cd ../doc + ${if bootstrapFromC + then "./etc/make-liarc.sh --prefix=$out" + else "make compile-microcode"} - # Provide a `texinfo.tex'. - export TEXINPUTS="$(echo ${automake}/share/automake-*)" - echo "\$TEXINPUTS is \`$TEXINPUTS'" - make + cd ../doc - cd .. - ''; + make - installPhase = - '' make prefix=$out install -C src - make prefix=$out install -C doc - ''; + cd .. - fixupPhase = + runHook postBuild + ''; + + + installPhase = '' + runHook preInstall + make prefix=$out install -C src + make prefix=$out install -C doc + runHook postInstall + ''; + + postFixup = '' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \ $out/lib/mit-scheme${arch} ''; - nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ]; + nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ]; # XXX: The `check' target doesn't exist. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index d9853dd642..2dd959600e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -81,37 +81,33 @@ stdenv.mkDerivation (args // { }; meta = with lib; { - homepage = "http://caml.inria.fr/ocaml"; + homepage = "https://ocaml.org/"; branch = versionNoPatch; license = with licenses; [ qpl /* compiler */ lgpl2 /* library */ ]; - description = "Most popular variant of the Caml language"; + description = "OCaml is an industrial-strength programming language supporting functional, imperative and object-oriented styles"; - longDescription = - '' - OCaml is the most popular variant of the Caml language. From a - language standpoint, it extends the core Caml language with a - fully-fledged object-oriented layer, as well as a powerful module - system, all connected by a sound, polymorphic type system featuring - type inference. + longDescription = '' + OCaml is a general purpose programming language with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria by a group of leading researchers, it has an advanced type system that helps catch your mistakes without getting in your way. It's used in environments where a single mistake can cost millions and speed matters, is supported by an active community, and has a rich set of libraries and development tools. It's widely used in teaching for its power and simplicity. - The OCaml system is an industrial-strength implementation of this - language, featuring a high-performance native-code compiler (ocamlopt) - for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, - Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) - and an interactive read-eval-print loop (ocaml) for quick development - and portability. The OCaml distribution includes a comprehensive - standard library, a replay debugger (ocamldebug), lexer (ocamllex) and - parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) - and a documentation generator (ocamldoc). - ''; + Strengths: + * A powerful type system, equipped with parametric polymorphism and type inference. For instance, the type of a collection can be parameterized by the type of its elements. This allows defining some operations over a collection independently of the type of its elements: sorting an array is one example. Furthermore, type inference allows defining such operations without having to explicitly provide the type of their parameters and result. + * User-definable algebraic data types and pattern-matching. New algebraic data types can be defined as combinations of records and sums. Functions that operate over such data structures can then be defined by pattern matching, a generalized form of the well-known switch statement, which offers a clean and elegant way of simultaneously examining and naming data. + * Automatic memory management, thanks to a fast, unobtrusive, incremental garbage collector. + * Separate compilation of standalone applications. Portable bytecode compilers allow creating stand-alone applications out of Caml Light or OCaml programs. A foreign function interface allows OCaml code to interoperate with C code when necessary. Interactive use of OCaml is also supported via a “read-evaluate-print” loop. + + In addition, OCaml features: + * A sophisticated module system, which allows organizing modules hierarchically and parameterizing a module over a number of other modules. + * An expressive object-oriented layer, featuring multiple inheritance, parametric and virtual classes. + * Efficient native code compilers. In addition to its bytecode compiler, OCaml offers a compiler that produces efficient machine code for many architectures. + + Learn more at: https://ocaml.org/learn/description.html + ''; platforms = with platforms; linux ++ darwin; broken = stdenv.isAarch64 && !lib.versionAtLeast version "4.06"; }; }) - - diff --git a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix index 6bc74971c4..00b20abbda 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -1,23 +1,19 @@ {lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: -# TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333 -# it does not work for the moment. We should switch back to byacc as soon as the fix is integrated -# in a published version. - stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "rednex"; + owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"; + sha256 = "11b1hg2m2f60q5622rb0nxhrzzylsxjx0c8inbxifi6lvmj9ak4x"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; meta = with lib; { - homepage = "https://rednex.github.io/rgbds/"; + homepage = "https://rgbds.gbdev.io/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; longDescription = diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index 615c200c63..7c3470fb4b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -7,11 +7,13 @@ with lib; mkCoqDerivation { owner = "CoqEAL"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.10") "1.12.0" ]; out = "1.0.6"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."1.0.6".sha256 = "0lqkyfj4qbq8wr3yk8qgn7mclw582n3fjl9l19yp8cnchspzywx0"; release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm"; release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix index 550b976a5c..1013975ac6 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix @@ -45,6 +45,8 @@ self: super: { # TODO: figure out if needed on aarch32 as well BNFC = dontCheck super.BNFC; C-structs = dontCheck super.C-structs; + Chart-tests = dontCheck super.Chart-tests; + Jikka = dontCheck super.Jikka; accelerate = dontCheck super.accelerate; ad = dontCheck super.ad; autoapply = dontCheck super.autoapply; @@ -93,6 +95,9 @@ self: super: { # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; + # We disable profiling on aarch64, so tests naturally fail + ghc-prof = dontCheck super.ghc-prof; + } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 935e56a9b9..f5c05c0c71 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0jnxh12vkrssz0lj4fpkqw7nxwyc1kisvvpm85cd4zf525m5sgg3"; + sha256 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1011,10 +1011,14 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; + # Requires dlist <0.9 but it works fine with dlist-1.0 + # https://github.com/haskell-beam/beam/issues/581 + beam-core = doJailbreak super.beam-core; + # Requires pg_ctl command during tests beam-postgres = overrideCabal super.beam-postgres (drv: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; - }); + }); # Fix for base >= 4.11 scat = overrideCabal super.scat (drv: { @@ -1040,12 +1044,6 @@ self: super: { # Has tasty < 1.2 requirement, but works just fine with 1.2 temporary-resourcet = doJailbreak super.temporary-resourcet; - # fake a home dir and capture generated man page - ats-format = overrideCabal super.ats-format (old : { - preConfigure = "export HOME=$PWD"; - postBuild = "mv .local/share $out"; - }); - # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 heap = dontCheck super.heap; @@ -1281,8 +1279,10 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_1_2 = dontCheck super.haskeline_0_8_1_2; + # Fails with encoding problems, likely needs locale data. + # Test can be executed by adding which to testToolDepends and + # $PWD/dist/build/haskeline-examples-Test to $PATH. + haskeline_0_8_2 = dontCheck super.haskeline_0_8_2; # Tests for list-t, superbuffer, and stm-containers # depend on HTF and it is broken, 2020-08-23 @@ -1433,7 +1433,7 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; - hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_2; }); + hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; }); # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; @@ -1914,4 +1914,27 @@ EOT assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; doJailbreak super.graphql; + # Test suite doesn't build with base16-bytestring >= 1.0.0.0 + # https://github.com/emilypi/Base16/issues/9 + base16 = dontCheck super.base16; + + # gtk2hsC2hs fails to build on certain architectures (aarch64, ppc64(le), ...) + # with a linker error. As a workaround, we build gtk2hs-buildtools with -O0 + # as suggested in the GHC thread below. An alternative to this could be to use + # -fllvm. I haven't been able to get this to work without linker errors, though. + # See also: + # * https://gitlab.haskell.org/ghc/ghc/-/issues/17203 + # * https://github.com/gtk2hs/gtk2hs/issues/305 + # * https://github.com/gtk2hs/gtk2hs/issues/279 + gtk2hs-buildtools = appendConfigureFlags super.gtk2hs-buildtools + (pkgs.lib.optionals (with pkgs.stdenv.hostPlatform; isAarch64 || isPowerPC) [ + "--ghc-option=-O0" + ]); + + # https://github.com/ajscholl/basic-cpuid/pull/1 + basic-cpuid = appendPatch super.basic-cpuid (pkgs.fetchpatch { + url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch"; + sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 48484dec9b..754f036b29 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -58,6 +58,12 @@ self: super: { OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL; + al = overrideCabal super.al (drv: { + libraryFrameworkDepends = [ + darwin.apple_sdk.frameworks.OpenAL + ] ++ (drv.libraryFrameworkDepends or []); + }); + proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox; # the system-fileio tests use canonicalizePath, which fails in the sandbox @@ -100,6 +106,12 @@ self: super: { hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate; + blas-hs = overrideCabal super.blas-hs (drv: { + libraryFrameworkDepends = [ + darwin.apple_sdk.frameworks.Accelerate + ] ++ (drv.libraryFrameworkDepends or []); + }); + # Ensure the necessary frameworks are propagatedBuildInputs on darwin OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { librarySystemDepends = []; @@ -168,6 +180,13 @@ self: super: { '' + (drv.postPatch or ""); }); + # conditional dependency via a cabal flag + cas-store = overrideCabal super.cas-store (drv: { + libraryHaskellDepends = [ + self.kqueue + ] ++ (drv.libraryHaskellDepends or []); + }); + # 2021-05-25: Tests fail and I have no way to debug them. hls-class-plugin = dontCheck super.hls-class-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin; @@ -179,4 +198,56 @@ self: super: { # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; + # On darwin librt doesn't exist and will fail to link against, + # however linking against it is also not necessary there + GLHUI = overrideCabal super.GLHUI (drv: { + postPatch = '' + substituteInPlace GLHUI.cabal --replace " rt" "" + '' + (drv.postPatch or ""); + }); + + SDL-image = overrideCabal super.SDL-image (drv: { + # Prevent darwin-specific configuration code path being taken + # which doesn't work with nixpkgs' SDL libraries + postPatch = '' + substituteInPlace configure --replace xDarwin noDarwinSpecialCasing + '' + (drv.postPatch or ""); + patches = [ + # Work around SDL_main.h redefining main to SDL_main + ./patches/SDL-image-darwin-hsc.patch + ]; + }); + + # Prevent darwin-specific configuration code path being taken which + # doesn't work with nixpkgs' SDL libraries + SDL-mixer = overrideCabal super.SDL-mixer (drv: { + postPatch = '' + substituteInPlace configure --replace xDarwin noDarwinSpecialCasing + '' + (drv.postPatch or ""); + }); + + # Work around SDL_main.h redefining main to SDL_main + SDL-ttf = appendPatch super.SDL-ttf ./patches/SDL-ttf-darwin-hsc.patch; + + # Disable a bunch of test suites that fail because of darwin's case insensitive + # file system: When a test suite has a test suite file that has the same name + # as a module in scope, but in different case (e. g. hedgehog.hs and Hedgehog + # in scope), GHC will complain that the file name and module name differ (in + # the example hedgehog.hs would be Main). + # These failures can easily be fixed by upstream by renaming files, so we + # should create issues for them. + # https://github.com/typeclasses/aws-cloudfront-signed-cookies/issues/2 + aws-cloudfront-signed-cookies = dontCheck super.aws-cloudfront-signed-cookies; + # https://github.com/typeclasses/assoc-list/issues/2 + assoc-list = dontCheck super.assoc-list; + assoc-listlike = dontCheck super.assoc-listlike; + # https://github.com/typeclasses/dsv/issues/1 + dsv = dontCheck super.dsv; + + # https://github.com/acid-state/acid-state/issues/133 + acid-state = dontCheck super.acid-state; + + # Otherwise impure gcc is used, which is Apple's weird wrapper + c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ]; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 624002162f..7ab9fc76f8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -286,7 +286,6 @@ broken-packages: - barrie - barrier - barrier-monad - - base16 - base64-conduit - base-compat-migrate - base-encoding @@ -305,7 +304,9 @@ broken-packages: - bdo - beam - beamable - - beam-core + - beam-mysql + - beam-newtype-field + - beam-sqlite - bech32 - bed-and-breakfast - beeminder-api @@ -1447,6 +1448,7 @@ broken-packages: - fractals - fraction - frag + - Frames-beam - Frames-map-reduce - franchise - fraxl @@ -1738,6 +1740,7 @@ broken-packages: - gtk2hs-rpn - gtk3-mac-integration - gtkglext + - gtk-mac-integration - gtksourceview2 - gtksourceview3 - gtk-toy @@ -2603,6 +2606,7 @@ broken-packages: - kalman - Kalman - kangaroo + - karabiner-config - karps - katip-kafka - katip-raven @@ -2630,7 +2634,6 @@ broken-packages: - koellner-phonetic - kontra-config - kparams - - kqueue - kraken - krapsh - Kriens @@ -2758,6 +2761,7 @@ broken-packages: - life-sync - lifted-protolude - lifter + - lifx-lan - ligature - lilypond - Limit @@ -3276,7 +3280,6 @@ broken-packages: - no-role-annots - notcpp - not-gloss-examples - - notifications-tray-icon - NoTrace - now-haskell - np-extras diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e5e4672e1d..c476862fb0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -342,7 +342,9 @@ unsupported-platforms: barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] bdcs-api: [ x86_64-darwin ] bindings-directfb: [ x86_64-darwin ] + bindings-parport: [ x86_64-darwin ] # parport is a linux kernel component bindings-sane: [ x86_64-darwin ] + btrfs: [ x86_64-darwin ] # depends on linux bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux @@ -356,6 +358,7 @@ unsupported-platforms: follow-file: [ x86_64-darwin ] freenect: [ x86_64-darwin ] FTGL: [ x86_64-darwin ] + fuzzytime: [ x86_64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 ghcjs-dom-hello: [ x86_64-darwin ] gi-dbusmenugtk3: [ x86_64-darwin ] gi-dbusmenu: [ x86_64-darwin ] @@ -375,9 +378,11 @@ unsupported-platforms: hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] honk: [ x86_64-darwin ] hpapi: [ x86_64-darwin ] + HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms HSoM: [ x86_64-darwin ] iwlib: [ x86_64-darwin ] jsaddle-webkit2gtk: [ x86_64-darwin ] + kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API LambdaHack: [ x86_64-darwin ] large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 libmodbus: [ x86_64-darwin ] @@ -400,6 +405,7 @@ unsupported-platforms: mplayer-spot: [ aarch64-linux ] mptcp-pm: [ x86_64-darwin ] netlink: [ x86_64-darwin ] + notifications-tray-icon: [ x86_64-darwin ] # depends on gi-dbusmenu oculus: [ x86_64-darwin ] pam: [ x86_64-darwin ] parport: [ x86_64-darwin ] diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e4c8c8b152..5d19b84390 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.4 +# Stackage LTS 18.5 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -469,7 +469,7 @@ default-package-overrides: - constraints-extras ==0.3.1.0 - constraint-tuples ==0.1.2 - construct ==0.3.0.2 - - contravariant ==1.5.3 + - contravariant ==1.5.5 - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 @@ -549,7 +549,7 @@ default-package-overrides: - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.3.1 + - data-fix ==0.3.2 - data-forest ==0.1.0.8 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 @@ -720,7 +720,7 @@ default-package-overrides: - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 - exceptions ==0.10.4 - - exception-transformers ==0.4.0.9 + - exception-transformers ==0.4.0.10 - exception-via ==0.1.0.0 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 @@ -772,10 +772,10 @@ default-package-overrides: - first-class-patterns ==0.3.2.5 - fitspec ==0.4.10 - fixed ==0.3 - - fixed-length ==0.2.2.1 + - fixed-length ==0.2.3 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.6.1.0 - - fix-whitespace ==0.0.5 + - fix-whitespace ==0.0.6 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 @@ -787,7 +787,7 @@ default-package-overrides: - flow ==1.0.22 - flush-queue ==1.0.0 - fmlist ==0.9.4 - - fmt ==0.6.1.2 + - fmt ==0.6.2.0 - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 @@ -1105,7 +1105,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7 + - HsOpenSSL ==0.11.7.1 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.10 @@ -1313,7 +1313,7 @@ default-package-overrides: - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 - jwt ==0.10.0 - - kan-extensions ==5.2.2 + - kan-extensions ==5.2.3 - kanji ==3.4.1 - katip ==0.8.5.0 - katip-logstash ==0.1.0.0 @@ -1526,7 +1526,7 @@ default-package-overrides: - modern-uri ==0.3.4.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - - monad-control ==1.0.2.3 + - monad-control ==1.0.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.1.2 - monad-extras ==0.6.0 @@ -2220,7 +2220,7 @@ default-package-overrides: - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 - - StateVar ==1.2.1 + - StateVar ==1.2.2 - static-text ==0.2.0.7 - statistics ==0.15.2.0 - status-notifier-item ==0.3.1.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fa5e7e5d8c..3186c36990 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -113,7 +113,6 @@ dont-distribute-packages: - Forestry - FormalGrammars - Foster - - Frames-beam - Frames-dsv - Frank - GLFW-OGL @@ -394,6 +393,7 @@ dont-distribute-packages: - adict - adp-multi-monadiccp - aern2-real + - aern2-real_0_2_8_0 - aeson-native - afv - agda-server @@ -515,7 +515,6 @@ dont-distribute-packages: - bamboo-theme-mini-html5 - bamse - bamstats - - base16-lens - base32-bytestring - base64-bytes - baserock-schema @@ -527,11 +526,6 @@ dont-distribute-packages: - bdcs - bdcs-api - beam-automigrate - - beam-migrate - - beam-mysql - - beam-newtype-field - - beam-postgres - - beam-sqlite - beam-th - beautifHOL - bech32-th @@ -1588,6 +1582,7 @@ dont-distribute-packages: - hs-ffmpeg - hs-gen-iface - hs-pkpass + - hs-sdl-term-emulator - hs-swisstable-hashtables-class - hs2dot - hsautogui @@ -2718,7 +2713,6 @@ dont-distribute-packages: - servant-streaming-docs - servant-streaming-server - servant-swagger-tags - - servant-util-beam-pg - servant-waargonaut - servant-zeppelin-client - servant-zeppelin-server diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index ef0bd0656f..1c96024fc0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -788,6 +788,11 @@ self: super: builtins.intersectAttrs super { platforms = pkgs.lib.platforms.x86; }; + # uses x86 intrinsics + geomancy = overrideCabal super.geomancy { + platforms = pkgs.lib.platforms.x86; + }; + hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: { testToolDepends = [ pkgs.git ]; preCheck = '' @@ -919,4 +924,29 @@ self: super: builtins.intersectAttrs super { # Flag added in Agda 2.6.2 Agda = appendConfigureFlag super.Agda "-foptimise-heavily"; + # ats-format uses cli-setup in Setup.hs which is quite happy to write + # to arbitrary files in $HOME. This doesn't either not achieve anything + # or even fail, so we prevent it and install everything necessary ourselves. + # See also: https://hackage.haskell.org/package/cli-setup-0.2.1.4/docs/src/Distribution.CommandLine.html#setManpathGeneric + ats-format = generateOptparseApplicativeCompletion "atsfmt" ( + justStaticExecutables ( + overrideCabal super.ats-format (drv: { + # use vanilla Setup.hs + preCompileBuildDriver = '' + cat > Setup.hs << EOF + module Main where + import Distribution.Simple + main = defaultMain + EOF + '' + (drv.preCompileBuildDriver or ""); + # install man page + buildTools = [ + pkgs.buildPackages.installShellFiles + ] ++ (drv.buildTools or []); + postInstall = '' + installManPage man/atsfmt.1 + '' + (drv.postInstall or ""); + }) + ) + ); } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index e3baf23a06..315edc5317 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -6395,6 +6395,7 @@ self: { description = "A library for accessing Postgres tables as in-memory data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Frames-dsv" = callPackage @@ -9021,6 +9022,7 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "quantitative finance library"; license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) gsl;}; "HROOT" = callPackage @@ -10745,20 +10747,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7"; - sha256 = "0kji758bi8agcjvpbb3hpppv55qm9g2r02mamiv568zwmlkkxsm3"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10770,7 +10758,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -11577,27 +11564,28 @@ self: { "Jikka" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, containers - , deepseq, doctest, happy, hlint, hspec, hspec-discover, mtl - , ormolu, text, transformers, vector + , deepseq, directory, doctest, happy, hlint, hspec, hspec-discover + , mtl, ormolu, template-haskell, text, transformers, vector }: mkDerivation { pname = "Jikka"; - version = "5.0.11.2"; - sha256 = "03f6xvg9jhalpa43k27dr9vzc02rchhf15irwp6gbzq3g63vzqi5"; + version = "5.1.0.0"; + sha256 = "0zr558lds5gqlgdpxgm65zjm4frcln50wr9q01djjq3441cxciqf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal array base containers deepseq mtl text transformers - vector + ansi-terminal array base containers deepseq directory mtl + template-haskell text transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ - ansi-terminal array base containers deepseq mtl text transformers - vector + ansi-terminal array base containers deepseq directory mtl + template-haskell text transformers vector ]; testHaskellDepends = [ - ansi-terminal array base containers deepseq doctest hlint hspec mtl - ormolu text transformers vector + ansi-terminal array base containers deepseq directory doctest hlint + hspec mtl ormolu template-haskell text transformers vector ]; testToolDepends = [ hspec-discover ]; description = "A transpiler from Python to C++ for competitive programming"; @@ -13808,16 +13796,16 @@ self: { }) {}; "Monadoro" = callPackage - ({ mkDerivation, ansi-terminal, base, doctest, process, time }: + ({ mkDerivation, ansi-terminal, base, doctest, hspec, time }: mkDerivation { pname = "Monadoro"; - version = "0.2.1.11"; - sha256 = "1vf1g298kygjkqxm99w2dnfd6a6iz0fnkzz0km95isnl0pdfgfnk"; + version = "0.2.5.0"; + sha256 = "0p3270xzwhq1j8m3mb4bvh95c4w16vrjj4cd0p87aq35xy99f4dr"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base process time ]; - executableHaskellDepends = [ ansi-terminal base process time ]; - testHaskellDepends = [ ansi-terminal base doctest process time ]; + libraryHaskellDepends = [ ansi-terminal base time ]; + executableHaskellDepends = [ ansi-terminal base time ]; + testHaskellDepends = [ ansi-terminal base doctest hspec time ]; description = "A minimalistic CLI Pomodoro timer"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -14171,20 +14159,20 @@ self: { }) {}; "NaCl" = callPackage - ({ mkDerivation, base, bytestring, hedgehog, HUnit, libsodium - , memory, safe-exceptions, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit + ({ mkDerivation, base, base16, bytestring, hedgehog, HUnit + , libsodium, memory, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "NaCl"; - version = "0.0.3.1"; - sha256 = "1ff793w4dc34nmd9s9pxdz6nrpqz9wv6bx5j0kxgmjvwzjx9i5ql"; + version = "0.0.4.0"; + sha256 = "13wjrki7d7a7zk67np00in5n3gkpmgw682hib09fmncnnisrwd9m"; libraryHaskellDepends = [ base bytestring libsodium memory safe-exceptions ]; testHaskellDepends = [ - base bytestring hedgehog HUnit libsodium memory safe-exceptions - tasty tasty-hedgehog tasty-hunit + base base16 bytestring hedgehog HUnit libsodium memory + safe-exceptions tasty tasty-hedgehog tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; @@ -19247,17 +19235,6 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "StateVar"; - version = "1.2.1"; - sha256 = "12qg01aksbnc7cdh01y4z4jwrrhhwcakc9gh6ywxhq1bj591a9pf"; - libraryHaskellDepends = [ base stm transformers ]; - description = "State variables"; - license = lib.licenses.bsd3; - }) {}; - - "StateVar_1_2_2" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -19266,7 +19243,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -24356,6 +24332,29 @@ self: { broken = true; }) {}; + "aern2-mp_0_2_8_0" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.8.0"; + sha256 = "0nfd2r05jm93idsgijccxzqkkpjkpkn8jz3kqwanlma0x3wj02cj"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck @@ -24377,6 +24376,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aern2-real_0_2_8_0" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.8.0"; + sha256 = "13nk4s5r7h7wg4q0x01f8aiy432zngynd5qbqsqi9fz149k7mik1"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as sequences of MPBalls"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring @@ -35563,6 +35583,8 @@ self: { pname = "aura"; version = "3.2.5"; sha256 = "1zrsjcvmhh3y0pahnz2fr944j2xz8sv4dcd9xz08vci4x1lm87hr"; + revision = "1"; + editedCabalFile = "0rmihjl4ysw36fpj4g5zkdhzvq8c0n0vxv4zlcmn35q37k85qpb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38307,8 +38329,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base16 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "base16-bytestring_0_1_1_7" = callPackage @@ -38357,7 +38377,6 @@ self: { ]; description = "Optics for the Base16 library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base32" = callPackage @@ -39418,8 +39437,6 @@ self: { ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "beam-migrate" = callPackage @@ -39440,7 +39457,6 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "beam-mysql" = callPackage @@ -39459,6 +39475,7 @@ self: { description = "Connection layer between beam and MySQL/MariaDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "beam-newtype-field" = callPackage @@ -39475,6 +39492,7 @@ self: { description = "A newtype for wrapping newtypes into beam schemas"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "beam-postgres" = callPackage @@ -39502,7 +39520,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "beam-sqlite" = callPackage @@ -39528,6 +39545,7 @@ self: { description = "Beam driver for SQLite"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "beam-th" = callPackage @@ -40352,6 +40370,8 @@ self: { pname = "bifunctors"; version = "5.5.11"; sha256 = "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb"; + revision = "1"; + editedCabalFile = "1xl5xqr76k7ixq2bjszjh83xkg3szarnzbrv2ahxnmmfbbl5whnc"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -41811,6 +41831,9 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "bindings-portaudio" = callPackage @@ -46547,6 +46570,9 @@ self: { libraryHaskellDepends = [ base bytestring time unix ]; description = "Bindings to the btrfs API"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "buchhaltung" = callPackage @@ -51014,39 +51040,45 @@ self: { "capnp" = callPackage ({ mkDerivation, async, base, bifunctors, bytes, bytestring - , containers, cpu, data-default, data-default-instances-vector - , deepseq, directory, exceptions, filepath, focus, hashable - , heredoc, hspec, list-t, monad-stm, mtl, network, network-simple - , pretty-show, primitive, process, process-extras, QuickCheck + , containers, criterion, data-default + , data-default-instances-vector, deepseq, directory, exceptions + , filepath, focus, ghc-prim, hashable, heredoc, hspec, lifetimes + , list-t, monad-stm, mtl, network, network-simple, pretty-show + , primitive, process, process-extras, QuickCheck , quickcheck-instances, quickcheck-io, resourcet, safe-exceptions , stm, stm-containers, supervisors, template-haskell, text , transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.10.0.1"; - sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf"; + version = "0.11.0.0"; + sha256 = "1pbgnaiv1zlykpc13vgr5aklfjc2bl84nz8fpvga5djjd0x905cw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytes bytestring containers cpu data-default - data-default-instances-vector exceptions focus hashable list-t - monad-stm mtl network network-simple pretty-show primitive - safe-exceptions stm stm-containers supervisors template-haskell - text transformers vector + async base bytes bytestring containers data-default + data-default-instances-vector exceptions focus ghc-prim hashable + lifetimes list-t monad-stm mtl network network-simple pretty-show + primitive safe-exceptions stm stm-containers supervisors + template-haskell text transformers vector ]; executableHaskellDepends = [ base bifunctors bytes bytestring containers data-default directory - exceptions filepath monad-stm mtl primitive safe-exceptions text - transformers vector wl-pprint-text + exceptions filepath ghc-prim monad-stm mtl primitive + safe-exceptions text transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq - directory exceptions heredoc hspec monad-stm mtl network + directory exceptions ghc-prim heredoc hspec monad-stm mtl network network-simple pretty-show primitive process process-extras QuickCheck quickcheck-instances quickcheck-io resourcet safe-exceptions stm supervisors text transformers vector ]; + benchmarkHaskellDepends = [ + base bytes bytestring containers criterion data-default deepseq + exceptions ghc-prim monad-stm mtl primitive process-extras + safe-exceptions text transformers vector + ]; description = "Cap'n Proto for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -54122,8 +54154,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.8.0.0"; - sha256 = "16xgq8xvfvk6rsjzaimd29b867ffml2h9nldsy5d5sninbmbq0k8"; + version = "0.9.0.0"; + sha256 = "0f8dd3w8az8fzidwiv2h6m52fppfp5b9zd0c1s4c815z3a3rxr4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59559,6 +59591,8 @@ self: { pname = "comonad"; version = "5.0.8"; sha256 = "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g"; + revision = "1"; + editedCabalFile = "0zlgkcd61cwsdbgjz03pfbjxhj6dc25792h7rwh0zy677vbsn6hz"; libraryHaskellDepends = [ base containers distributive indexed-traversable tagged transformers transformers-compat @@ -63494,17 +63528,6 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, StateVar, transformers }: - mkDerivation { - pname = "contravariant"; - version = "1.5.3"; - sha256 = "1haxsq7jl95gzmbjdr2pgza9b7j0j3f26wwkf494gphz6c76yls4"; - libraryHaskellDepends = [ base StateVar transformers ]; - description = "Contravariant functors"; - license = lib.licenses.bsd3; - }) {}; - - "contravariant_1_5_5" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; @@ -63513,7 +63536,6 @@ self: { libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -66430,19 +66452,19 @@ self: { }) {}; "crypto-sodium" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cereal - , hedgehog, HUnit, libsodium, memory, NaCl, safe-exceptions, tasty - , tasty-discover, tasty-hedgehog, tasty-hunit + ({ mkDerivation, base, base16, bytestring, cereal, deepseq + , hedgehog, HUnit, libsodium, memory, NaCl, random, safe-exceptions + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "crypto-sodium"; - version = "0.0.3.1"; - sha256 = "1hjwxbxszhg9z83i6p141avalwi9rjh4v014vh1dcj69dqb7q00h"; + version = "0.0.4.0"; + sha256 = "0wypzd06z12mc7pffryp7bq7rzzws348i79yg3x25d4kmi6xqydw"; libraryHaskellDepends = [ - base bytestring cereal libsodium memory NaCl safe-exceptions + base bytestring cereal libsodium memory NaCl random safe-exceptions ]; testHaskellDepends = [ - base base16-bytestring bytestring hedgehog HUnit libsodium memory + base base16 bytestring deepseq hedgehog HUnit libsodium memory safe-exceptions tasty tasty-hedgehog tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -69675,17 +69697,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base, deepseq, hashable }: - mkDerivation { - pname = "data-fix"; - version = "0.3.1"; - sha256 = "0yfciggx8l82nfpv40w2673glnl9nnbh269kpfbw28i98x0c0icv"; - libraryHaskellDepends = [ base deepseq hashable ]; - description = "Fixpoint data types"; - license = lib.licenses.bsd3; - }) {}; - - "data-fix_0_3_2" = callPackage ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "data-fix"; @@ -69694,7 +69705,6 @@ self: { libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -75965,8 +75975,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2.1"; - sha256 = "04x8y6snlfm8w22l0mn58sqbgdsc3av9l6qz2wqfdjmcp7h7s79r"; + version = "0.2.2"; + sha256 = "1v7mayj3cjr1gl27d5fzgghrwk08d87da9ckyk5l7ksjqf6d4px7"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -77675,6 +77685,8 @@ self: { pname = "distributive"; version = "0.6.2.1"; sha256 = "14bb66qyfn43bj688igfvnfjw7iycjf4n2k38sm8rxbqw2916dfp"; + revision = "1"; + editedCabalFile = "033890dfyd23dh7g7px863l0hr1b881jnhv4kgwaq16a3iagb68g"; libraryHaskellDepends = [ base base-orphans tagged transformers ]; testHaskellDepends = [ base generic-deriving hspec ]; testToolDepends = [ hspec-discover ]; @@ -81103,8 +81115,8 @@ self: { }: mkDerivation { pname = "dynamic-pipeline"; - version = "0.3.1.3"; - sha256 = "01f98acd9hkqi5jbgm7zb69ci6gsf8rwlwddw6g5id2kvim557n8"; + version = "0.3.2.0"; + sha256 = "1wm9dk1y4crrskj6c5fyamx2p6b3xmvwa0xyj27wwlps6zhwxyj8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87261,23 +87273,6 @@ self: { }) {}; "exception-transformers" = callPackage - ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit - , transformers, transformers-compat - }: - mkDerivation { - pname = "exception-transformers"; - version = "0.4.0.9"; - sha256 = "033z8mhczwf59lh59q3z546gkcsy0bzg98r1qhm3fiq7j11hgd95"; - libraryHaskellDepends = [ base transformers transformers-compat ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit transformers - transformers-compat - ]; - description = "Type classes and monads for unchecked extensible exceptions"; - license = lib.licenses.bsd3; - }) {}; - - "exception-transformers_0_4_0_10" = callPackage ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit , transformers, transformers-compat }: @@ -87292,7 +87287,6 @@ self: { ]; description = "Type classes and monads for unchecked extensible exceptions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exception-via" = callPackage @@ -89998,8 +89992,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "0.9.1"; - sha256 = "1da3q7i2qsrc0hal97rbmmp6609n3z9hqn1i67a5lhi4z7mk8fab"; + version = "0.9.1.1"; + sha256 = "00qqgvbbv03qafbmvcgy8yf5l0jlyal6c2cmsfqnkl3c0qp0mq88"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92400,24 +92394,6 @@ self: { }) {}; "fix-whitespace" = callPackage - ({ mkDerivation, base, directory, extra, filepath, filepattern - , text, yaml - }: - mkDerivation { - pname = "fix-whitespace"; - version = "0.0.5"; - sha256 = "1774h18dqarkbsdq47cx1zrxx0k1a7asxngz85yz5vrc2aa37hy7"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory extra filepath filepattern text yaml - ]; - description = "Fixes whitespace issues"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - }) {}; - - "fix-whitespace_0_0_6" = callPackage ({ mkDerivation, base, directory, extra, filepath, filepattern , text, yaml }: @@ -92447,20 +92423,6 @@ self: { }) {}; "fixed-length" = callPackage - ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht - }: - mkDerivation { - pname = "fixed-length"; - version = "0.2.2.1"; - sha256 = "123iyy1id86h0j45jyc9jiz24hvjw7j3l57iv80b57gv4hd8a6q7"; - libraryHaskellDepends = [ - base non-empty storable-record tfp utility-ht - ]; - description = "Lists with statically known length based on non-empty package"; - license = lib.licenses.bsd3; - }) {}; - - "fixed-length_0_2_3" = callPackage ({ mkDerivation, base, non-empty, storable-record, tfp , transformers, utility-ht }: @@ -92473,7 +92435,6 @@ self: { ]; description = "Lists with statically known length based on non-empty package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fixed-list" = callPackage @@ -93310,19 +93271,20 @@ self: { "flink-statefulfun" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers, either - , http-media, http-types, lens-family, mtl, proto-lens + , http-media, http-types, lens-family, microlens, mtl, proto-lens , proto-lens-protobuf-types, proto-lens-protoc, proto-lens-runtime - , proto-lens-setup, servant, servant-server, text, wai, warp + , proto-lens-setup, servant, servant-server, text, time, uuid, wai + , warp }: mkDerivation { pname = "flink-statefulfun"; - version = "0.3.0.0"; - sha256 = "046acb9mb40cxdbm57s3davdwlpgjkf23xxkprxrl3pbyfxl1g8k"; + version = "0.4.0.0"; + sha256 = "1g4qvp5d9j8fgqxjz624nbmfmyk9sd777l1cfhcgr7vhjq2i98kj"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ aeson base bytestring containers either http-media http-types - lens-family mtl proto-lens proto-lens-protobuf-types - proto-lens-runtime servant servant-server text wai warp + lens-family microlens mtl proto-lens proto-lens-protobuf-types + proto-lens-runtime servant servant-server text time uuid wai warp ]; libraryToolDepends = [ proto-lens-protoc ]; description = "Flink stateful functions SDK"; @@ -94036,33 +93998,6 @@ self: { }) {}; "fmt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, call-stack - , containers, criterion, deepseq, doctest, doctest-discover - , formatting, hspec, interpolate, microlens, neat-interpolation - , QuickCheck, text, time, time-locale-compat, vector - }: - mkDerivation { - pname = "fmt"; - version = "0.6.1.2"; - sha256 = "1fcamg5vpbmn0h7y4xkyrrmpkbyqqkijpgm2bhsw82swnbfppvbq"; - libraryHaskellDepends = [ - base base64-bytestring bytestring call-stack containers formatting - microlens text time time-locale-compat - ]; - testHaskellDepends = [ - base bytestring call-stack containers doctest hspec - neat-interpolation QuickCheck text vector - ]; - testToolDepends = [ doctest-discover ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq formatting interpolate - text vector - ]; - description = "A new formatting library"; - license = lib.licenses.bsd3; - }) {}; - - "fmt_0_6_2_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover , formatting, hspec, interpolate, microlens, neat-interpolation @@ -94087,7 +94022,6 @@ self: { ]; description = "A new formatting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fmt-for-rio" = callPackage @@ -97894,18 +97828,16 @@ self: { "futhark-data" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-to-vector - , containers, megaparsec, mtl, QuickCheck, tasty, tasty-hunit + , containers, half, megaparsec, mtl, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text, vector, vector-binary-instances }: mkDerivation { pname = "futhark-data"; - version = "1.0.0.1"; - sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; - revision = "1"; - editedCabalFile = "08p820dmdlg5x6ikgi69sddkywj71cnnjwz2fppnv901bbn55fav"; + version = "1.0.1.1"; + sha256 = "1rd3hrsr0zq6v5wwhgn5mam5262lmvihaa8g4pxnl47lh3hc8q5w"; libraryHaskellDepends = [ - base binary bytestring bytestring-to-vector containers megaparsec - mtl text vector vector-binary-instances + base binary bytestring bytestring-to-vector containers half + megaparsec mtl text vector vector-binary-instances ]; testHaskellDepends = [ base binary bytestring megaparsec QuickCheck tasty tasty-hunit @@ -98168,6 +98100,9 @@ self: { ]; description = "A 'ten past six' style clock"; license = "GPL"; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "fvars" = callPackage @@ -104918,8 +104853,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210714"; - sha256 = "0pkzqa8qmckv4fcc9pndlplz4w0ndlqkp18hx6pyycckycljdyzy"; + version = "8.20210803"; + sha256 = "0777q454bgkzr930wacn48xm6ygi4i6rxsizvxjm3a0dlffnv3b2"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -110365,6 +110300,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "gotyno-hs" = callPackage + ({ mkDerivation, base, fsnotify, hspec, megaparsec + , optparse-applicative, pretty-show, rio, text + }: + mkDerivation { + pname = "gotyno-hs"; + version = "1.0.2"; + sha256 = "1jn6bi0c5ciqw8lsd331mww47mz5qy3bb3672gk00q4pvyl7idkr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base fsnotify megaparsec pretty-show rio text + ]; + executableHaskellDepends = [ + base fsnotify megaparsec optparse-applicative pretty-show rio text + ]; + testHaskellDepends = [ + base fsnotify hspec megaparsec pretty-show rio text + ]; + description = "A type definition compiler supporting multiple output languages"; + license = lib.licenses.bsd2; + }) {}; + "gpah" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv , deepseq, directory, filepath, haskell-src-exts, hint, HTTP @@ -112710,6 +112668,8 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = lib.licenses.lgpl21Only; platforms = [ "x86_64-darwin" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage @@ -114538,8 +114498,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "7"; - editedCabalFile = "16bnd1m2cp4i6hs2krivvf8fxr5hrx2mx0hygw4zkvgbfzwl42wy"; + revision = "8"; + editedCabalFile = "1xpzcdpfz0agbv75sadsylq6r8pq7zr0pyzbzrz0nz130yixsv5f"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -115041,8 +115001,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.6.0"; - sha256 = "0kxj853j4kr9vfp66mc47bd0ylzddbj6in6i7sjlcx4i861n3xnj"; + version = "2.6.1"; + sha256 = "1h4bcgjf6kxhaxjhdmpxkgxamrg3ibw43hkr97iqk9h5skjcx6d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115869,8 +115829,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "1.0.1"; - sha256 = "1fbwg37899m82y0gskk9wsif8bc9c3j4iznyqj7v54m5y0hxlhc0"; + version = "1.1.0"; + sha256 = "0kafqdhzwj8cjsdwv395981j09yjbzy2k8m09ql90l968zlm3bic"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -116720,8 +116680,8 @@ self: { }: mkDerivation { pname = "hanspell"; - version = "0.2.3.0"; - sha256 = "1n692i4d92g25j31v7iyp7w3135hxcdm5p18zki8mmx6x1pg244a"; + version = "0.2.6.0"; + sha256 = "0qk7zxq43mjcxyzhiidk0zm4sb2ii5wwr4zqihky538s6mqf5ccz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118785,15 +118745,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "haskeline_0_8_1_2" = callPackage + "haskeline_0_8_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.1.2"; - sha256 = "0axr258a8wrsq37jwx4g343969lycydx9symijnp64a7ki67jrnp"; + version = "0.8.2"; + sha256 = "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -130154,7 +130114,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger_1_22" = callPackage + "hledger_1_22_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, githash, hashable, haskeline @@ -130165,10 +130125,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.22"; - sha256 = "1w7akdl9pn77s3fnb5wq3f7k2xpxnf91ann8qy5gpq66nszm6pqc"; - revision = "1"; - editedCabalFile = "1b0pdsav3xhcfyn814ddfn58l9nhan9yfafksn0y0ckfwyqgbcmd"; + version = "1.22.1"; + sha256 = "0pj0xfjgcfskfm8cfay00jj0amya480846vcv65l2mw191svjb0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130425,7 +130383,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_22" = callPackage + "hledger-lib_1_22_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default @@ -130437,10 +130395,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.22"; - sha256 = "06qddk2nhjq3g02in3hcxz4hfwq9fcb3356shzbljx7ssmzjakzm"; - revision = "1"; - editedCabalFile = "1l51rzm7119vd69qyzw020hc4ss47gsra9vh6qsj7ws6jnyckclz"; + version = "1.22.1"; + sha256 = "090zrvx1af341p0m1n4bdhgv5h5aq93bxnyk9d9yf5bv25zd1r3b"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -130536,7 +130492,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-ui_1_22" = callPackage + "hledger-ui_1_22_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -130545,10 +130501,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.22"; - sha256 = "1izidpxwygghq0c3z7pygf9c9qlsydw89gs6475hsd4qiqc06gjr"; - revision = "1"; - editedCabalFile = "1l5jizxh7cz26s0zkr9l25r44fizpysg9bh4ykc043l30dfi5fi2"; + version = "1.22.1"; + sha256 = "0q0vrsrg0hblycmrbgibyq8264drli6zjp5ppxpw874vkipjcvip"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130620,7 +130574,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "hledger-web_1_22" = callPackage + "hledger-web_1_22_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath @@ -130633,10 +130587,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.22"; - sha256 = "0miy111zz8yqw0i87sn91aiplznc7fbirznpar8y5mch8z4wn4bs"; - revision = "1"; - editedCabalFile = "18ps7rk7by475d2s95s1iblv04i6y8ks4q0a4s6q38a79g9qk50g"; + version = "1.22.1"; + sha256 = "02ckw3012icz4hmbw7bdiclwwk2cqwrl3ds1f3w9i52lgwk5ncpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135843,6 +135795,28 @@ self: { broken = true; }) {}; + "hs-sdl-term-emulator" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit + , conduit-extra, hs-term-emulator, lens, linear, posix-pty, process + , sdl2, stm, stm-conduit, vector + }: + mkDerivation { + pname = "hs-sdl-term-emulator"; + version = "0.1.0.4"; + sha256 = "1pknfni2a39vgm28z0xiynnzah4znp8l5z5b3i5fymsv3a0qf9sn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base bytestring conduit conduit-extra + hs-term-emulator lens linear posix-pty process sdl2 stm stm-conduit + vector + ]; + executableHaskellDepends = [ base ]; + description = "Terminal Emulator written in Haskell, SDL2 Backend"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hs-server-starter" = callPackage ({ mkDerivation, base, directory, HUnit, network, temporary, unix }: @@ -135934,14 +135908,14 @@ self: { }: mkDerivation { pname = "hs-term-emulator"; - version = "0.1.0.3"; - sha256 = "0agl1xhidj4a9vm3nx4ahkx06kvv2kk83qxfv7l5mb9ml3myrqnp"; + version = "0.1.0.4"; + sha256 = "1fcfym449w2rk56sjarbqjmkxs6w3ww32viazl2p1ghn6cb9pk10"; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring containers lens text vector ]; testHaskellDepends = [ - ansi-terminal attoparsec base hspec text vector + ansi-terminal attoparsec base hspec lens text vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion ]; @@ -146633,6 +146607,8 @@ self: { pname = "ilist"; version = "0.4.0.1"; sha256 = "016wa9n4glxcyvbifvfz2khk9i1i5wzfyl952vp1fhwpjrr8aj04"; + revision = "1"; + editedCabalFile = "0v95piihkiaw69n5wr761h7ky463z6irpg4dwszj1b7g0g7vcyhy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; benchmarkHaskellDepends = [ @@ -155105,26 +155081,6 @@ self: { }) {}; "kan-extensions" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, invariant, mtl, profunctors - , semigroupoids, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "kan-extensions"; - version = "5.2.2"; - sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; - revision = "1"; - editedCabalFile = "1scfkj28l7dcrlzcvf0x4vlkpg8d0r4s08l3ccnwlhnxvzsmwkj7"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free invariant mtl profunctors semigroupoids tagged - transformers transformers-compat - ]; - description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; - license = lib.licenses.bsd3; - }) {}; - - "kan-extensions_5_2_3" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, invariant, mtl, profunctors , semigroupoids, tagged, transformers, transformers-compat @@ -155140,7 +155096,6 @@ self: { ]; description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "kangaroo" = callPackage @@ -155280,6 +155235,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "karabiner-config" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , file-embed, hspec, process, temporary, text + }: + mkDerivation { + pname = "karabiner-config"; + version = "0.0.0.0"; + sha256 = "0ic8h33f6ij63y718zy43x8yvcmayd8hxrqb8fs9v2f5b3sxxp9v"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory text + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory file-embed hspec + process temporary text + ]; + description = "Karabiner elements configuration generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "karakuri" = callPackage ({ mkDerivation, base, comonad, containers, minioperational, mtl , transformers @@ -157320,8 +157296,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ "x86_64-darwin" ]; }) {}; "kraken" = callPackage @@ -159135,6 +159110,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_10_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter + , QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "10.0.2"; + sha256 = "0x8lwc28j2f4rdk1yfhb4jkkrlvvhj46m0d42yv2f94y6v8adkr8"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -162967,6 +162965,22 @@ self: { broken = true; }) {}; + "libmdbx" = callPackage + ({ mkDerivation, base, bytestring, c2hs, mtl, store, text }: + mkDerivation { + pname = "libmdbx"; + version = "0.1.0.4"; + sha256 = "0gkpj2chxmq9kb6mg9r78x4w4lspr2sq3462xy1m9y2frcbbkf8p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl text ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base bytestring mtl store text ]; + testHaskellDepends = [ base mtl text ]; + description = "Bindings for libmdbx, an embedded key/value store"; + license = lib.licenses.bsd3; + }) {}; + "libmodbus" = callPackage ({ mkDerivation, base, bytestring, data-default, modbus, vector }: mkDerivation { @@ -163882,14 +163896,16 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.3.0"; - sha256 = "051h65m47vnhakg37a8dj1mbisxc9pb5zk4yp41dvcr0as2x4ngl"; + version = "0.5.0.1"; + sha256 = "0rww31gcp5asbc0zb6fz7ddgw3dih6l2mc0rln7nf3qd04hplk6v"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl network random safe text time transformers ]; description = "LIFX LAN API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ligature" = callPackage @@ -168520,6 +168536,37 @@ self: { license = lib.licenses.mit; }) {}; + "lsp_1_2_0_1" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, exceptions, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.2.0.1"; + sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map exceptions hashable hslogger lens lsp-types mtl + network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base containers filepath hspec lens network-uri QuickCheck + quickcheck-instances rope-utf16-splay sorted-list text + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -168547,6 +168594,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, extra, filepath, Glob, hspec, lens, lsp + , lsp-types, mtl, parser-combinators, process, some, text, time + , transformers, unix, unliftio, unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.14.0.1"; + sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers + ]; + testHaskellDepends = [ + aeson async base data-default directory filepath hspec lens lsp mtl + parser-combinators process text unliftio unordered-containers + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum, dependent-sum-template @@ -168568,6 +168643,28 @@ self: { license = lib.licenses.mit; }) {}; + "lsp-types_1_3_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , data-default, deepseq, dependent-sum-template, Diff, directory + , dlist, filepath, hashable, hslogger, lens, mtl, network-uri + , rope-utf16-splay, scientific, some, template-haskell, temporary + , text, unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.3.0.0"; + sha256 = "1v897kp5ian8cwpkh23fdn3f1ysk72vs2ks26b7v9mc7dca0x0sc"; + libraryHaskellDepends = [ + aeson base binary bytestring containers data-default deepseq + dependent-sum-template Diff directory dlist filepath hashable + hslogger lens mtl network-uri rope-utf16-splay scientific some + template-haskell temporary text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -171698,6 +171795,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "massiv_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions + , mersenne-random-pure64, mwc-random, primitive, QuickCheck, random + , scheduler, splitmix, template-haskell, unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "1.0.0.0"; + sha256 = "0cb9riab486gz9xxx44sx5pagfjc8kv8936avywxpwpn3dhbxg6a"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions primitive random scheduler + unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 mwc-random QuickCheck random + splitmix template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels @@ -171722,6 +171841,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "massiv-io_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, data-default-class + , deepseq, doctest, exceptions, filepath, hspec, hspec-discover + , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random + , template-haskell, unliftio, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "1.0.0.0"; + sha256 = "186zn0rw61hjsf99ry12qa7dmrjl92km8snksddfq9929q0dss6x"; + libraryHaskellDepends = [ + base bytestring Color data-default-class deepseq exceptions + filepath JuicyPixels massiv netpbm unliftio vector + ]; + testHaskellDepends = [ + base bytestring doctest hspec JuicyPixels massiv massiv-test + QuickCheck random template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Import/export of Image files into massiv Arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "massiv-persist" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, hspec , hspec-discover, massiv, massiv-test, persist, primitive @@ -171746,6 +171889,28 @@ self: { broken = true; }) {}; + "massiv-persist_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, doctest, hspec + , hspec-discover, massiv, massiv-test, persist, primitive + , QuickCheck + }: + mkDerivation { + pname = "massiv-persist"; + version = "1.0.0.0"; + sha256 = "0kgw4ac6ywgx44mqyfyhhxpaxzyph9pgz27nvr625j4hg84mx552"; + libraryHaskellDepends = [ + base bytestring deepseq massiv persist primitive + ]; + testHaskellDepends = [ + base doctest hspec massiv massiv-test persist QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Compatibility of 'massiv' with 'persist'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -171787,6 +171952,25 @@ self: { broken = true; }) {}; + "massiv-serialise_1_0_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover + , massiv, massiv-test, QuickCheck, serialise, vector + }: + mkDerivation { + pname = "massiv-serialise"; + version = "1.0.0.0"; + sha256 = "18ahbfq54mggar7wknghdjybd4pbqjzgfaghv5lp5daccbxahgyd"; + libraryHaskellDepends = [ base deepseq massiv serialise vector ]; + testHaskellDepends = [ + base doctest hspec massiv massiv-test QuickCheck serialise + ]; + testToolDepends = [ hspec-discover ]; + description = "Compatibility of 'massiv' with 'serialise'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "massiv-test" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec @@ -171811,6 +171995,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "massiv-test_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , hspec-discover, massiv, mwc-random, primitive, QuickCheck + , scheduler, unliftio, vector + }: + mkDerivation { + pname = "massiv-test"; + version = "1.0.0.0"; + sha256 = "1hd9y2n038ja3wz317ah0k84dz30cnmzx0nms9hkr5inf62gbd3n"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv mwc-random primitive QuickCheck scheduler vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -176525,6 +176733,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_9_1" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.9.1"; + sha256 = "009hsagx0g1myf2jlljqnf96mwnz3a4jbcmrcjs0lizskprzj1n2"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -177812,8 +178040,8 @@ self: { }: mkDerivation { pname = "monad-control"; - version = "1.0.2.3"; - sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c"; + version = "1.0.3"; + sha256 = "16rdv4s85ni1xdbd8nzarm4sh331198jnmakrn5wxla9hrfwg2fi"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -177821,14 +178049,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "monad-control_1_0_3" = callPackage + "monad-control_1_0_3_1" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat }: mkDerivation { pname = "monad-control"; - version = "1.0.3"; - sha256 = "16rdv4s85ni1xdbd8nzarm4sh331198jnmakrn5wxla9hrfwg2fi"; + version = "1.0.3.1"; + sha256 = "0g3if9km8ik80bcy130a826ig9wlk4bnf0qli3vmwdwr9nhaw2xf"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -177882,6 +178110,22 @@ self: { license = "GPL"; }) {}; + "monad-coroutine_0_9_1_3" = callPackage + ({ mkDerivation, base, monad-parallel, transformers + , transformers-compat + }: + mkDerivation { + pname = "monad-coroutine"; + version = "0.9.1.3"; + sha256 = "0ns8863695hm4yabd4908znpn1bqc7ayfnzl9bkkqhs70rff2dmh"; + libraryHaskellDepends = [ + base monad-parallel transformers transformers-compat + ]; + description = "Coroutine monad transformer for suspending and resuming monadic computations"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-dijkstra" = callPackage ({ mkDerivation, base, containers, free, hlint, mtl, psqueues , tasty, tasty-hspec, transformers @@ -178463,6 +178707,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "monad-parallel_0_7_2_5" = callPackage + ({ mkDerivation, base, parallel, transformers, transformers-compat + }: + mkDerivation { + pname = "monad-parallel"; + version = "0.7.2.5"; + sha256 = "0yjn8acn8z8b1v5nnmwrmrcim9lqh942kgi2c03cnnklfdc1cqip"; + libraryHaskellDepends = [ + base parallel transformers transformers-compat + ]; + description = "Parallel execution of monadic computations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-parallel-progressbar" = callPackage ({ mkDerivation, base, monad-parallel, monadIO , terminal-progress-bar @@ -179369,6 +179628,8 @@ self: { pname = "mono-traversable"; version = "1.0.15.1"; sha256 = "1psxhfjmpv3y54wy8f8dwa43finlj7aw2mry67pg521gxmwmppy2"; + revision = "1"; + editedCabalFile = "1bzzfyn8q4v9d7nnaxa2vx81xxii4n9596cb2gph9sml1wk3i9ly"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -181121,8 +181382,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.6.0.1"; - sha256 = "1qrbrvk4df7179zpjngq6r0xvy3jfv4r1vh88m7knzm75wkg77xx"; + version = "0.6.0.2"; + sha256 = "1glp86kbimsjh1hlmdivp12qzvcy6c5yyx5ynvrwibwnxj5g968v"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -189127,8 +189388,8 @@ self: { }: mkDerivation { pname = "notifications-tray-icon"; - version = "0.1.0.0"; - sha256 = "0w047kwqccwkcykmryn3dmf3kkpjkcffz0slsmyf52va604kk7x4"; + version = "0.1.1.0"; + sha256 = "07q201smb9knbwlflca1py5chck4a74lz0dvz7im01q1b1w6799r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189141,8 +189402,9 @@ self: { transformers tuple ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "notmuch" = callPackage @@ -191887,6 +192149,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_4_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.4.0"; + sha256 = "1v4gxqnjacyj7npcvl70dzksgl12qrgwscv4l47kvzmf76i1x6rd"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -200785,6 +201076,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-mtl_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, esqueleto + , monad-logger, mtl, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool, resourcet + , tasty, tasty-golden, tasty-hunit, text, transformers, unliftio + , unliftio-core, unliftio-pool + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.3.0.0"; + sha256 = "1srahd7n5xcl6sai2p3y1vmin9sbyf30xxqcjhqsj3bl5hjab5hz"; + libraryHaskellDepends = [ + base conduit containers mtl persistent resource-pool resourcet text + transformers unliftio unliftio-core unliftio-pool + ]; + testHaskellDepends = [ + base bytestring conduit containers esqueleto monad-logger + persistent persistent-postgresql persistent-sqlite + persistent-template resource-pool resourcet tasty tasty-golden + tasty-hunit text unliftio + ]; + description = "Monad transformer for the persistent API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit @@ -201987,8 +202304,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.5.0.0"; - sha256 = "0lvlrjg424d5jqvplqml3zybai1nhg5zc6kmk5vd01dph2ny3zxw"; + version = "0.5.1.0"; + sha256 = "0ahgkbrh0rsi7ykz9mai1fsmb367a39nviwpqy71qf3gsz8znwyw"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -202037,8 +202354,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.6.0.0"; - sha256 = "0cr7cqc9vkim5cr30lqkglfqyxaqnpaqjicfzzfbr75wqrjljjpm"; + version = "0.6.2.0"; + sha256 = "0h6zmvv8zfsaz29z5hyqjw2zcsrjcdxyl76cz8m0yiklinc5b2wb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202099,8 +202416,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.6.0.0"; - sha256 = "0knihshb5ahrvdzabbfvgnmhxq94kv985k4cjimh4h4dkzvlmkpj"; + version = "0.6.2.0"; + sha256 = "03z076ml2wzi521f9p022khhzdg0ymhs52sapqcq6x5xx0x5plzz"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -202138,8 +202455,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.4.0.0"; - sha256 = "1k4s7nr6kcf2y0954grn08s8q49pwq9sq11fyzbil3vsxgb6cy82"; + version = "0.4.2.0"; + sha256 = "09j5j79kclz32g59mbd0djq8hs1r17vy4mcb3n9zvs2ydlsyx2x2"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -202190,8 +202507,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.4.0.0"; - sha256 = "19g1xd50k6gvqjq58a5yzqxnq92acgv2ni8m1vp95ajw9cwacsc2"; + version = "0.4.2.0"; + sha256 = "0mq7cdlqk6gz54pz394ns7fq3rz0jdwryy6r8kcfpf1qywb61b4s"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -205620,6 +205937,28 @@ self: { broken = true; }) {}; + "poker" = callPackage + ({ mkDerivation, array, base, binary, gauge, hspec, mtl, random-fu + , random-source, rvar, split, vector + }: + mkDerivation { + pname = "poker"; + version = "0.1.0.0"; + sha256 = "15kykgv52w9q6bngggpdg4kgp0yms5n0kg500ip7rh1l88d7rzr5"; + revision = "1"; + editedCabalFile = "0z3inj16xfkniynigdphfwcmcgk3wyf9ypx0v8jycv2ibvqkc2hp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary mtl random-fu random-source rvar vector + ]; + executableHaskellDepends = [ base random-fu ]; + testHaskellDepends = [ base hspec split ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "Texas holdem hand evaluation and simulation"; + license = lib.licenses.mit; + }) {}; + "poker-eval" = callPackage ({ mkDerivation, array, base, mtl, poker-eval, random, vector }: mkDerivation { @@ -205760,6 +206099,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "polling-cache" = callPackage + ({ mkDerivation, base, exceptions, hspec, hspec-discover, mtl + , random, stm, time, transformers, unliftio + }: + mkDerivation { + pname = "polling-cache"; + version = "0.1.1.0"; + sha256 = "16hz5s5flz96j3l3b827hdymz75qqs66a05rwmz4b8332db3y5dm"; + libraryHaskellDepends = [ + base exceptions random stm time unliftio + ]; + testHaskellDepends = [ + base exceptions hspec hspec-discover mtl random stm time + transformers unliftio + ]; + testToolDepends = [ hspec-discover ]; + description = "Cache infrequently updated data for simpler distributed systems"; + license = lib.licenses.bsd3; + }) {}; + "poly" = callPackage ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty @@ -206063,20 +206422,19 @@ self: { "polysemy-chronos" = callPackage ({ mkDerivation, aeson, base, chronos, containers, hedgehog - , polysemy, polysemy-plugin, polysemy-test, polysemy-time, relude - , tasty, tasty-hedgehog, text + , polysemy, polysemy-test, polysemy-time, relude, tasty + , tasty-hedgehog, text }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.3.1"; - sha256 = "1fk8sh5nd6zg017pvra2k0sh13g8yq5rw8wvkb0zkyz5qk4a7ybc"; + version = "0.1.3.2"; + sha256 = "0h3fla28m0y9fgw5pxrirz3bhm7baf12z70a5s8rmpi8q5h8v841"; libraryHaskellDepends = [ - aeson base chronos containers polysemy polysemy-plugin - polysemy-time relude text + aeson base chronos containers polysemy polysemy-time relude text ]; testHaskellDepends = [ - aeson base chronos containers hedgehog polysemy polysemy-plugin - polysemy-test polysemy-time relude tasty tasty-hedgehog text + aeson base chronos containers hedgehog polysemy polysemy-test + polysemy-time relude tasty tasty-hedgehog text ]; description = "Polysemy-time Interpreters for Chronos"; license = "BSD-2-Clause-Patent"; @@ -206087,20 +206445,20 @@ self: { ({ mkDerivation, async, base, containers, hedgehog, polysemy , polysemy-test, polysemy-time, relude, stm, stm-chans , string-interpolate, tasty, tasty-hedgehog, template-haskell, text - , time, unix + , time, unagi-chan, unix }: mkDerivation { pname = "polysemy-conc"; - version = "0.1.0.3"; - sha256 = "1ml4f4g59sdvy5m81rivglc3sg3cg3spj0bf9mgdnvbrvlzxv3b9"; + version = "0.1.1.0"; + sha256 = "0mhhywk0iziw33j8i47k8fbdk8xrzr382afkk5wlwac7gqr4hxkf"; libraryHaskellDepends = [ async base containers polysemy polysemy-time relude stm stm-chans - string-interpolate template-haskell text time unix + string-interpolate template-haskell text time unagi-chan unix ]; testHaskellDepends = [ async base containers hedgehog polysemy polysemy-test polysemy-time relude stm stm-chans string-interpolate tasty tasty-hedgehog - template-haskell text time unix + template-haskell text time unagi-chan unix ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; @@ -206303,15 +206661,14 @@ self: { }) {}; "polysemy-methodology" = callPackage - ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-plugin - , polysemy-several + ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-several }: mkDerivation { pname = "polysemy-methodology"; - version = "0.2.0.0"; - sha256 = "0cfd0xqcx8b5zrl5my03zx1h1mxqkdyrhn1nba453mk3lnvynwmw"; + version = "0.2.1.0"; + sha256 = "17md6l5smy1ssn99kij6rnb42bx3fx8h49z85cm9sf41k6lb5k1g"; libraryHaskellDepends = [ - base polysemy polysemy-kvstore polysemy-plugin polysemy-several + base polysemy polysemy-kvstore polysemy-several ]; description = "Domain modelling algebra for polysemy"; license = lib.licenses.mit; @@ -206506,16 +206863,12 @@ self: { }) {}; "polysemy-socket" = callPackage - ({ mkDerivation, base, bytestring, polysemy, polysemy-plugin - , socket - }: + ({ mkDerivation, base, bytestring, polysemy, socket }: mkDerivation { pname = "polysemy-socket"; - version = "0.0.1.0"; - sha256 = "18ja1z7sl1xzfvhm43pazjsx76w944m4b3wp6yl4wichxwqka9jj"; - libraryHaskellDepends = [ - base bytestring polysemy polysemy-plugin socket - ]; + version = "0.0.2.0"; + sha256 = "0465sax3927cig1plbdyhifx1xipai68w01085mvslvd6am9mz6y"; + libraryHaskellDepends = [ base bytestring polysemy socket ]; description = "Socket effect for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -206523,23 +206876,23 @@ self: { "polysemy-test" = callPackage ({ mkDerivation, base, containers, either, hedgehog, path, path-io - , polysemy, polysemy-plugin, relude, string-interpolate, tasty - , tasty-hedgehog, template-haskell, text, transformers + , polysemy, relude, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, transformers }: mkDerivation { pname = "polysemy-test"; - version = "0.3.1.6"; - sha256 = "0c4yfxk23cf16dzd46ddr4kk2529rmmz3r2k0531kyh4yx1w5536"; + version = "0.3.1.7"; + sha256 = "0cra8zz7xmgw1103j3a1a4sk8jvk073wnyyk51x2fxiwjpqmax1y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers either hedgehog path path-io polysemy - polysemy-plugin relude string-interpolate tasty tasty-hedgehog - template-haskell text transformers + base containers either hedgehog path path-io polysemy relude + string-interpolate tasty tasty-hedgehog template-haskell text + transformers ]; testHaskellDepends = [ - base containers either hedgehog path path-io polysemy - polysemy-plugin relude string-interpolate tasty tasty-hedgehog - template-haskell text transformers + base containers either hedgehog path path-io polysemy relude + string-interpolate tasty tasty-hedgehog template-haskell text + transformers ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -206548,22 +206901,22 @@ self: { "polysemy-time" = callPackage ({ mkDerivation, aeson, base, composition, containers, data-default - , either, hedgehog, polysemy, polysemy-plugin, polysemy-test - , relude, string-interpolate, tasty, tasty-hedgehog - , template-haskell, text, time, torsor + , either, hedgehog, polysemy, polysemy-test, relude + , string-interpolate, tasty, tasty-hedgehog, template-haskell, text + , time, torsor }: mkDerivation { pname = "polysemy-time"; - version = "0.1.3.1"; - sha256 = "10gcqvgarhniracxks43rhphhls1v5hbg4k5ankbzjixjmm34gpv"; + version = "0.1.3.2"; + sha256 = "0h0fds1qz2k9w24v6kng8hb5zr32r6y6r8jm2jaj2krn9s58pv7b"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor ]; testHaskellDepends = [ aeson base composition containers data-default either hedgehog - polysemy polysemy-plugin polysemy-test relude string-interpolate - tasty tasty-hedgehog template-haskell text time torsor + polysemy polysemy-test relude string-interpolate tasty + tasty-hedgehog template-haskell text time torsor ]; description = "Polysemy Effect for Time"; license = "BSD-2-Clause-Patent"; @@ -206571,18 +206924,12 @@ self: { }) {}; "polysemy-uncontrolled" = callPackage - ({ mkDerivation, base, polysemy, polysemy-methodology - , polysemy-plugin - }: + ({ mkDerivation, base, polysemy, polysemy-methodology }: mkDerivation { pname = "polysemy-uncontrolled"; - version = "0.1.0.0"; - sha256 = "137zw5366c4h7q8w7cj7h4wc4njf1n2f7kabyrl6bqav1fjb96lx"; - revision = "1"; - editedCabalFile = "1wadnvrazf6z10k5s86749zadymmw2j45amak286706qfh4zwjd1"; - libraryHaskellDepends = [ - base polysemy polysemy-methodology polysemy-plugin - ]; + version = "0.1.1.0"; + sha256 = "08q69sn1ac4xhpffiabayw2l5j1jy9iz1y37ww84kx32njas9c2b"; + libraryHaskellDepends = [ base polysemy polysemy-methodology ]; description = "Uncontrolled toy effect for polysemy"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -206876,8 +207223,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.6.4"; - sha256 = "1izcyk30r527p4zx8yyi42r1xsl01gc5jpdrpkz1lksnjc6vzxq3"; + version = "0.5.6.5"; + sha256 = "1k01mmd19wcv5gzavnh81fhdiq8rlhvnv63f6n3s582qlsdc2lhi"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -209591,17 +209938,18 @@ self: { , criterion, deepseq, generic-random, happy, hedgehog, mtl , postgresql-binary, postgresql-libpq, scientific, syb, tasty , tasty-hedgehog, tasty-hunit, template-haskell, text - , th-lift-instances, time, transformers, uuid, vector, vector-sized + , th-lift-instances, time, transformers, unordered-containers, uuid + , vector, vector-sized }: mkDerivation { pname = "preql"; - version = "0.5"; - sha256 = "13lyk12x8i34q5s6dc9q7mzhax7662r7frhiiklvd0s0ksk25rqq"; + version = "0.6"; + sha256 = "0yixz7g6jvn2f60jj4ih0l01i3qh9nhkwsk9ykdf33mixlpq546f"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant mtl postgresql-binary postgresql-libpq scientific syb - template-haskell text th-lift-instances time transformers uuid - vector vector-sized + template-haskell text th-lift-instances time transformers + unordered-containers uuid vector vector-sized ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -209609,14 +209957,15 @@ self: { containers contravariant generic-random hedgehog mtl postgresql-binary postgresql-libpq scientific syb tasty tasty-hedgehog tasty-hunit template-haskell text th-lift-instances - time transformers uuid vector vector-sized + time transformers unordered-containers uuid vector vector-sized ]; testToolDepends = [ alex happy ]; benchmarkHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant criterion deepseq mtl postgresql-binary postgresql-libpq scientific syb template-haskell text - th-lift-instances time transformers uuid vector vector-sized + th-lift-instances time transformers unordered-containers uuid + vector vector-sized ]; benchmarkToolDepends = [ alex happy ]; description = "safe PostgreSQL queries using Quasiquoters"; @@ -210348,6 +210697,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive_0_7_2_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, tagged, tasty, tasty-quickcheck + , transformers, transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.2.0"; + sha256 = "1facmq2wxhn5mbgd209zz5swyaw1q970fv3hd84klaxrhabqaxwi"; + libraryHaskellDepends = [ base deepseq transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -211194,8 +211562,8 @@ self: { }: mkDerivation { pname = "procex"; - version = "0.2.2"; - sha256 = "0gnrpk3n8127wc92m3qrq0hka6p56pxjrmgafxgb0w03mlvwc89q"; + version = "0.3.0"; + sha256 = "1s4p6150ps17pb1wzq1qysw92nivy1pxqpwacqyyclkrg07rql9b"; libraryHaskellDepends = [ async base bytestring containers deepseq unix utf8-string ]; @@ -211495,6 +211863,8 @@ self: { pname = "profunctors"; version = "5.6.2"; sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; + revision = "1"; + editedCabalFile = "1babivznc9027xdafv28jb34a74bsymafp1xahbdd1n1gz7q27nr"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -212086,8 +212456,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.12"; - sha256 = "0j2w2j6df965fhh828y6x55p70wi4r7plrlzzgzxxhq0lhjdjyr0"; + version = "5.13"; + sha256 = "0hr2n5kxc7l6a0h5fs6i5hspni7ymw5dzgxwfdsa8j6mpzrw5yd4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212258,8 +212628,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.1"; - sha256 = "1l2rxhs5v8mi77qw98849m0w2swwxvg5wm6d4j123sa29riyb70a"; + version = "0.9.2"; + sha256 = "0wrahbiq7pa7bg0x7z9ynmy9ap30rj0lldgc2m7b49zhj43kax83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -212277,8 +212647,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, SDL2 }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.1"; - sha256 = "1qgb7zj7sj8sc3b7fwfq51s5m997dqgx74dmmkfam2s4v46fhqr4"; + version = "0.9.2"; + sha256 = "0qn6rnv4wc0g8s2mnsx71281nmgi29gnnnbskzy1kbzrwxlshrcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -214001,18 +214371,18 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , containers, data-default, hspec, http2, http2-client, lifted-base , mtl, optparse-applicative, random, resource-pool, semigroups - , text, time, tls, x509, x509-store + , text, time, tls, x509, x509-store, x509-system }: mkDerivation { pname = "push-notify-apn"; - version = "0.2.0.2"; - sha256 = "194xn4wrnpdcyc76b9qplyfv15qgrqb60x41j43lwskh8yvr57sx"; + version = "0.3.0.0"; + sha256 = "1bvdndyvrggvjc6y2dkhx570g8l9y58cr88kinbv4sg65kxnxsy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring containers data-default http2 http2-client lifted-base mtl random - resource-pool semigroups text time tls x509 x509-store + resource-pool semigroups text time tls x509 x509-store x509-system ]; executableHaskellDepends = [ base bytestring optparse-applicative semigroups text @@ -223150,6 +223520,22 @@ self: { license = lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_4_5_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.4.5.0"; + sha256 = "1mr7d6w5x6igsvl6mccchr2wbxxr5p86kpyxlbk7m17dplvwazcq"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec , parser-combinators, text @@ -227114,20 +227500,21 @@ self: { }) {}; "rrb-vector" = callPackage - ({ mkDerivation, base, deepseq, gauge, hspec, indexed-traversable - , primitive, QuickCheck + ({ mkDerivation, base, deepseq, ghc-heap-view, indexed-traversable + , primitive, tasty, tasty-bench, tasty-quickcheck }: mkDerivation { pname = "rrb-vector"; - version = "0.1.0.0"; - sha256 = "1kn4ygi0jrx0a6s6cbfxx60r2vqgzrqflm5yaffjlwb55jf88m8i"; - revision = "1"; - editedCabalFile = "1ydx0mxkqfjdgq9rqg2bzn5rqc0jdn8f40d4pa9yg0l00kjl4kcz"; + version = "0.1.1.0"; + sha256 = "0awpx18qklxz5lscmj5ypl8paqja4r2xk4aqj0r181560j7arv3j"; libraryHaskellDepends = [ base deepseq indexed-traversable primitive ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ base gauge primitive ]; + testHaskellDepends = [ + base deepseq ghc-heap-view indexed-traversable tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base primitive tasty-bench ]; description = "Efficient RRB-Vectors"; license = lib.licenses.bsd3; }) {}; @@ -230561,8 +230948,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "3"; - editedCabalFile = "0lvvfbjf4w73y43ax80h9yb2nvf3n2kc859j9advcmfnmdn33x5v"; + revision = "4"; + editedCabalFile = "0xwqybz4hhhw6ccqgyf4khis06p2pc17h9b78va0wywqsz01xaqb"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -231932,6 +232319,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "secure-memory" = callPackage + ({ mkDerivation, async, base, bytestring, hedgehog, HUnit + , libsodium, memory, reflection, safe-exceptions, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, text, unix + }: + mkDerivation { + pname = "secure-memory"; + version = "0.0.0.1"; + sha256 = "0765lkdnkzdmk3r8hbipxb2brg000jg4dqscqcjjh59lvsiaq367"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring libsodium memory reflection safe-exceptions text + unix + ]; + executableHaskellDepends = [ + base bytestring libsodium memory safe-exceptions + ]; + testHaskellDepends = [ + async base bytestring hedgehog HUnit libsodium memory + safe-exceptions tasty tasty-hedgehog tasty-hunit unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Securely allocated and deallocated memory"; + license = lib.licenses.mpl20; + }) {}; + "secure-sockets" = callPackage ({ mkDerivation, base, bytestring, directory, HsOpenSSL, network , process, transformers @@ -235915,7 +236329,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Implementation of servant-util primitives for beam-postgres"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "servant-validate" = callPackage @@ -247440,8 +247853,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.3"; - sha256 = "1nszwagwsc6n02smqg70c79a21q9bwamlk4nqqbgzp009jfv0b7c"; + version = "0.3.1"; + sha256 = "034y2a8zhfjrf2wjqhsvkxycwypyykyq9abq2ir33nadgxlshfk4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -253587,6 +254000,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sv2v" = callPackage + ({ mkDerivation, alex, array, base, cmdargs, containers, directory + , filepath, githash, happy, hashable, mtl, vector + }: + mkDerivation { + pname = "sv2v"; + version = "0.0.8"; + sha256 = "1zkl0qsg9pg8dl4k5cvq2gbp6alxx1hzhmbdqpm7wdd9z9qag17w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base cmdargs containers directory filepath githash hashable + mtl vector + ]; + executableToolDepends = [ alex happy ]; + description = "SystemVerilog to Verilog conversion"; + license = lib.licenses.bsd3; + }) {}; + "svfactor" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset , deepseq, hedgehog, lens, parsec, parsers, semigroupoids @@ -265027,6 +265459,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "tldr_0_9_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers + , directory, filepath, http-conduit, optparse-applicative + , semigroups, tasty, tasty-golden, text, time, zip-archive + }: + mkDerivation { + pname = "tldr"; + version = "0.9.1"; + sha256 = "0xgj3mf51iv68fhgyrjvxfmzrbcwnk7siaynm213x0kgcyvkwbz0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark containers directory filepath + http-conduit optparse-applicative semigroups text time zip-archive + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Haskell tldr client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tlex" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , enummapset-th, hspec, hspec-discover, QuickCheck, tlex-core @@ -267033,6 +267487,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "transformers-base_0_4_6" = callPackage + ({ mkDerivation, base, base-orphans, stm, transformers + , transformers-compat + }: + mkDerivation { + pname = "transformers-base"; + version = "0.4.6"; + sha256 = "146g69yxmlrmvqnzwcw4frxfl3z04lda9zqwcqib34dnkrlghfrj"; + libraryHaskellDepends = [ + base base-orphans stm transformers transformers-compat + ]; + description = "Lift computations from the bottom of a transformer stack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "transformers-bifunctors" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -267606,6 +268076,8 @@ self: { pname = "treap"; version = "0.0.0.0"; sha256 = "0zq2jislk5fg7lshya6iivcksxh5wgb54kgllgqqra07w0sp6bd9"; + revision = "1"; + editedCabalFile = "1fljz20yn9igag80vapjw266nsnlkxvkwcdrz73kzh9m53gjymhz"; libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ]; testHaskellDepends = [ base doctest Glob hspec hspec-core ]; description = "Efficient implementation of the implicit treap data structure"; @@ -268080,6 +268552,8 @@ self: { pname = "trial"; version = "0.0.0.0"; sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; + revision = "1"; + editedCabalFile = "1anl65i1zk2764078n7xa0ymrrg58hwlsnm4b6km56yw77j3nkc3"; libraryHaskellDepends = [ base colourista dlist ]; testHaskellDepends = [ base dlist doctest hedgehog hspec hspec-hedgehog splitmix @@ -268105,6 +268579,8 @@ self: { pname = "trial-tomland"; version = "0.0.0.0"; sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; + revision = "1"; + editedCabalFile = "1h2ygxwg75hvx8izmfgrkk1sznafpkaxz3v18hxfv4b8lfm9nfkl"; libraryHaskellDepends = [ base text tomland trial ]; description = "Trial helper functions for tomland"; license = lib.licenses.mpl20; @@ -270098,6 +270574,19 @@ self: { license = lib.licenses.mpl20; }) {}; + "type-errors-pretty_0_0_1_2" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-errors-pretty"; + version = "0.0.1.2"; + sha256 = "01zdb5mw77d5rj3yvabqdch132mjw49awpjnjvms20hdhwjgqb6b"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Combinators for writing pretty type errors easily"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-fun" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -271085,6 +271574,31 @@ self: { license = lib.licenses.mpl20; }) {}; + "typerep-map_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, hspec, hspec-hedgehog, primitive, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.4.0.0"; + sha256 = "0fgn7blxfnwwh92wzd5jma7rniqp9f7abb4wvr61mvhw44m6mvgr"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hspec hspec-hedgehog + ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -273776,8 +274290,8 @@ self: { pname = "unliftio-core"; version = "0.2.0.1"; sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"; - revision = "1"; - editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv"; + revision = "2"; + editedCabalFile = "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -278901,8 +279415,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.11.3"; - sha256 = "1mcami1hksn0kkr0wi9hk6hjd8ns4f65fqk7bh7c8zvj1z3i3zhy"; + version = "3.11.5"; + sha256 = "18g8ckarjqz4nws1gihx3wpywqwkiwg88qq071sjs7wvsnwbjf2s"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -282385,8 +282899,8 @@ self: { }: mkDerivation { pname = "webify"; - version = "0.1.9.0"; - sha256 = "0gfdzxy7qsxpqqrkm3dy37d68xp8nvx0q9189msbfp3x4yalfb1z"; + version = "0.1.10.0"; + sha256 = "11c1va4yl0r8x3qf218jq1f0ik8mpfbzmzp6y2is8hzyf3w8glm8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -292482,8 +292996,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.17.0.0"; - sha256 = "1czw727j73n4rdlxb97jvr082xdvsqyp6n99qxq73gigag6jp0zk"; + version = "0.18.0.1"; + sha256 = "0sjzqn1mxqqlqg4zhkl1r3nh125i0pkpl2lplw99dgsbpdv8q71a"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -292493,7 +293007,7 @@ self: { unix ]; executableHaskellDepends = [ - base containers directory filepath unix + base containers directory filepath mtl unix ]; testHaskellDepends = [ base directory filepath ]; doHaddock = false; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-image-darwin-hsc.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-image-darwin-hsc.patch new file mode 100644 index 0000000000..74d7fca853 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-image-darwin-hsc.patch @@ -0,0 +1,9 @@ +--- SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc.orig 2021-08-06 01:21:05.000000000 +0200 ++++ SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc 2021-08-06 01:21:56.000000000 +0200 +@@ -1,4 +1,6 @@ + #include "SDL_image.h" ++-- override SDL_main.h redefining main to SDL_main on darwin ++#define main main + module Graphics.UI.SDL.Image.Version + ( compiledFor + , linkedWith diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-ttf-darwin-hsc.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-ttf-darwin-hsc.patch new file mode 100644 index 0000000000..3cc5c54f06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/SDL-ttf-darwin-hsc.patch @@ -0,0 +1,9 @@ +--- SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc.orig 2021-08-06 01:31:39.000000000 +0200 ++++ SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc 2021-08-06 01:32:03.000000000 +0200 +@@ -1,4 +1,6 @@ + #include "SDL_ttf.h" ++-- override SDL_main.h redefining main to SDL_main on darwin ++#define main main + module Graphics.UI.SDL.TTF.Version + ( compiledFor + , linkedWith diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 145391229e..850a5f3d77 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "-J-Dclojure.spec.skip-macros=true" "-J-Dclojure.compiler.direct-linking=true" "-H:IncludeResources=BABASHKA_VERSION" + "-H:IncludeResources=META-INF/babashka/.*" "-H:IncludeResources=SCI_VERSION" "-H:ReflectionConfigurationFiles=${reflectionJson}" "--initialize-at-build-time" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 77ec74e8c3..3fca18f65a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { echo "Installing libs into $clojure_lib_dir" install -Dm644 deps.edn "$clojure_lib_dir/deps.edn" install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn" + install -Dm644 tools.edn "$clojure_lib_dir/tools.edn" install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar" install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar" @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - CLJ_CONFIG=$out CLJ_CACHE=$out/libexec $out/bin/clojure \ + CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \ -Spath \ -Sverbose \ -Scp $out/libexec/clojure-tools-${version}.jar diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 7dabff3d2e..81200a94aa 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-EPxWLPw+V5eIm+eL8m8Xw14adgshthJSDRyWohsJH88="; + sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE="; }; - cargoSha256 = "sha256-5jGrv0YRVMo2X9p/WPgjYV3z193hl2+NiFTZr3v0Iik="; + cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix index 524273e080..f58441beed 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { inherit version; }; - phases = [ "installPhase" ]; - installPhase = '' runHook preInstall install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix index 83afeaf2d6..7c90092fe8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; preConfigure = "autoreconf -i -f"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix index b27cb8aae3..35f78d4afe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-IftPSQOrZOqMLHHlUFEFa3WcvsqN5kdS5rSlGE8ETC4="; + sha256 = "sha256-aKSxKYJ2OmxCDHwBrfUMenT9LYzFYH5P3R8q/QhkM+c="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix index 18c40c5b5f..34d6bf14e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "alkimia"; - version = "8.0.4"; + version = "8.1.0"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8="; + sha256 = "sha256-kWgHNScHsEkM3ZymVoLv9zsAylIwKb2m/nonSaG8knw="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 79c1715c61..13305d3127 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out mv * $out/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index 3923416c4a..81f4bb6c2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -153,7 +153,7 @@ let } ''; - phases = [ "preBuild" "buildPhase" "installPhase" ]; + dontUnpack = true; } // args); in rec { @@ -905,7 +905,11 @@ in rec { langInputs = [ en ]; - buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en"; + buildPhase = '' + runHook preBuild + cat $src | aspell-affix en-computers --dont-validate-words --lang=en + runHook postBuild + ''; installPhase = "aspell-install en-computers"; meta = { @@ -930,8 +934,10 @@ in rec { langInputs = [ en ]; buildPhase = '' + runHook preBuild cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en + runHook postBuild ''; installPhase = "aspell-install en_US-science en_GB-science"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index 15785d25fe..eb14a44e4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d"; + sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn"; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix index 34a4f93bb8..122bd93873 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.7.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ="; + sha256 = "sha256-vg2tpGyZZM8c97Qko88JMP5YNPZx5kI5qRkkRclvZtA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index c030f53df2..a4f19678f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.01"; + version = "21.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-D7nlwQnz2JPRB3JrrkyUcaaf4Ro/+Ap8sqq5Oz8naHw="; + sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index 1340f5e87a..2b284c82ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -1,15 +1,23 @@ -{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc +{ stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc , freetype, fontconfig, pixman, tllist, check , withHarfBuzz ? true , harfbuzz }: +let + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; +in + stdenv.mkDerivation rec { pname = "fcft"; version = "2.4.4"; - src = fetchzip { - url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fcft"; + rev = version; sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57"; }; @@ -19,15 +27,16 @@ stdenv.mkDerivation rec { ++ lib.optional withHarfBuzz harfbuzz; checkInputs = [ check ]; + mesonBuildType = "release"; mesonFlags = [ - "--buildtype=release" - "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}" + (mesonFeatureFlag "text-shaping" withHarfBuzz) ]; doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; + changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}"; description = "Simple library for font loading and glyph rasterization"; maintainers = with maintainers; [ fionera diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index 212b656add..a80a5cd9f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.01.25.00"; + version = "2021.08.02.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-n2cpXdjPZYNjvSHBZFFn3JFwqYCFWc8qSKwet80LtJE="; + sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index c1f485e18d..456e311a0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "13rxagpzw6bal6ajlmrxlh9kgfvcixn6j734b2bvfqz7lch8n0pa"; + sha256 = "sha256-h/e2vJacUp7PITez9HPzGc5+ofz7Oplso44VibECmsI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix index b151db07df..204af0a92b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.20"; + version = "1.3.21"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "sha256-9SPDe7BkpLq321IkkCw07uT5+rLZuBz2FbMsC4UJ0y0="; + sha256 = "sha256-ms4+9KL/LKUKmb4Gi2D7H9vJ6rivU+NF6XznW6S2O1Y="; }; patches = [ ./hivex-syms.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 596326b36d..f1a2aa0c6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,7 +45,6 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - phases = "unpackPhase patchPhase buildPhase installPhase"; nativeBuildInputs = [ unzip ]; buildInputs = [ bash coreutils which zip ]; patchPhase = '' @@ -89,7 +88,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile @@ -129,7 +127,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} @@ -158,7 +155,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile} @@ -185,7 +181,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase patchPhase installPhase"; sourceRoot = "."; prePatch = '' # Fix dic file empty lines (FS#22275) @@ -204,7 +199,6 @@ let inherit srcs; - phases = ["unpackPhase" "installPhase"]; sourceRoot = "."; # Copy files stripping until first dash (path and hash) unpackCmd = "cp $curSrc \${curSrc##*-}"; @@ -242,7 +236,8 @@ let buildInputs = [ ispell perl hunspell ]; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; + installPhase = '' patchShebangs bin make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index b64d4d5053..7cc25ec3fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.3.0"; + version = "21.3.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1byliq1c80xfklm3d2d910j1i7s7pfi3i3c6baigag1kzgc0apd0"; + sha256 = "0f6lgnca68aj9gdbxla2mwgap33ksdgiss0m7dk35r0slgf0hdxr"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix index 79f63026e3..3bbedde2e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.20"; + version = "1.21"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg"; + sha256 = "sha256-sWF0K5MSOSXUxBLC9+1/RF5ST4tIzVKGnKQvStuVLvM="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix index 32b0006223..19c8833db7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.1"; + version = "2.6.0"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; + sha256 = "sha256-GhuTBJl1E+aoWa8pTWEqzghHDXXiCQFIt++8pjCQYik="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index a4dd9cbaa4..0d3c20651c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -1,12 +1,34 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation +, lib +, fetchurl , cmake , qtbase }: mkDerivation rec { pname = "kdsoap"; - version = "1.10.0"; - meta = { + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; + sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + postInstall = '' + moveToOutput bin/kdwsdl2cpp "$dev" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + -e "s@$out/bin@$dev/bin@" + ''; + + meta = with lib; { description = "A Qt-based client-side and server-side SOAP component"; longDescription = '' KD Soap is a Qt-based client-side and server-side SOAP component. @@ -15,21 +37,7 @@ mkDerivation rec { provides the means to create web services without the need for any further component such as a dedicated web server. ''; - license = with lib.licenses; [ gpl2 gpl3 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + license = with licenses; [ gpl2 gpl3 lgpl21 ]; + maintainers = [ maintainers.ttuegel ]; }; - src = fetchurl { - url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48="; - }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase ]; - postInstall = '' - moveToOutput bin/kdwsdl2cpp "$dev" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ - -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ - -e "s@$out/bin@$dev/bin@" - ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index 222747b4d7..a07bc73a64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -1,22 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm -, withPython ? false, python ? null }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, cmake +, pkg-config +, libdrm +, fmt +, libevdev +, withPython ? false +, python3Packages +}: stdenv.mkDerivation { pname = "kmsxx"; - version = "2020-08-04"; + version = "2021-07-26"; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe"; - sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; + rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7"; + sha256 = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; }; - cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; + # Didn't detect pybind11 without cmake + nativeBuildInputs = [ meson ninja pkg-config ] ++ lib.optionals withPython [ cmake ]; + buildInputs = [ libdrm fmt libevdev ] + ++ lib.optionals withPython (with python3Packages; [ python pybind11 ]); - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ]; + dontUseCmakeConfigure = true; + + mesonFlags = lib.optional (!withPython) "-Dpykms=disabled"; meta = with lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; @@ -24,6 +39,5 @@ stdenv.mkDerivation { license = licenses.mpl20; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = true; # marked broken 2021-03-26 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix index f7cac0c037..ca0afe103b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "kquickimageeditor"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4X3GO/NPzA3c9KiGIkznLHUjLfNNNnPXif7IFwY5dOM="; + sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix new file mode 100644 index 0000000000..9e30973f19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libfreeaptx/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libfreeaptx"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "iamthehorker"; + repo = pname; + rev = version; + sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + # disable static builds + "ANAME=" + "AOBJECTS=" + "STATIC_UTILITIES=" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Free Implementation of Audio Processing Technology codec (aptX)"; + license = licenses.lgpl21Plus; + homepage = "https://github.com/iamthehorker/libfreeaptx"; + platforms = platforms.linux; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 2208606a81..dd2738b177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k="; + sha256 = "sha256-STAfA2QgSrCZaT/tcoj0BVnFfO3jbe6W2FgVOfxjpJc="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index 4d52b848ae..81ad3bd810 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.5.14"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ixqJ37+ljAru3hZ512nosTak0G/m6/nnmv2p/s5sVLs="; + sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8="; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix index 1193119999..187508a998 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/microsoft_gsl/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Microsoft/GSL"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; + maintainers = with maintainers; [ thoughtpolice yuriaisaka ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix b/third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix index e48857861d..13a814684a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/miniball/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index e4a731d317..fae2ff5a0f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , autoreconfHook , boost , gfortran , lhapdf , ncurses +, perl , python ? null , swig , yoda @@ -13,19 +14,28 @@ , withPython ? false }: +let + tag = "2823"; +in + stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2411"; + version = "2.5.0pre-${tag}"; - src = fetchurl { - urls = [ - "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" - "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" - ]; - sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; - }; + src = fetchFromGitLab { + domain = "gitlab.etp.kit.edu"; + owner = "qcd-public"; + repo = "fastNLO"; + rev = tag; + hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; + } + /v2.5/toolkit; - nativeBuildInputs = lib.optional withPython autoreconfHook; + postPatch = '' + # remove duplicate macro, to fix for autoconf 2.70 + sed -e '0,/AC_CONFIG_MACRO_DIR\([m4]\)/{/AC_CONFIG_MACRO_DIR/d}' -i configure.ac + ''; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ boost @@ -51,6 +61,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + checkInputs = [ + perl + lhapdf.pdf_sets.CT10nlo + ]; + preCheck = '' + patchShebangs --build check + ''; + enableParallelChecking = false; + meta = with lib; { homepage = "http://fastnlo.hepforge.org"; description = "Fast pQCD calculations for hadron-induced processes"; @@ -68,5 +88,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; + broken = stdenv.isAarch64; # failing test "fnlo-tk-stattest.pl" }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 3fed43d2d0..d23a7b8e7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -29,7 +29,7 @@ , withMediaSession ? true , gstreamerSupport ? true, gst_all_1 ? null , ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null, fdk_aac ? null +, bluezSupport ? true, bluez ? null, sbc ? null, libfreeaptx ? null, ldacbt ? null, fdk_aac ? null , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true @@ -48,7 +48,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.32"; + version = "0.3.33"; outputs = [ "out" @@ -66,7 +66,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp"; + sha256 = "sha256-HP2HcGjrLw0+8pO1upvJQk32v+bifYpi5Rtod0TbBis="; }; patches = [ @@ -110,7 +110,7 @@ let systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi; @@ -209,7 +209,7 @@ let homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar kranzes ]; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 14ef813043..57335fa3d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.11.1"; + version = "1.11.4"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "0iwn627wynrqrwb2ddm38p6y6cpgcavgbkrrxwxa0d26m9v2avpr"; + sha256 = "sha256-pXadPs2Dlht3BMNYDVxWZqnVv0umDgYVcqH5YVxr+uA="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 1ff8c2b0cc..4614c14981 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }: stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI="; + sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb"; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; - buildInputs = [ libuv ]; + buildInputs = [ libuv lz4 ]; enableParallelBuilding = true; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/canonical/raft"; license = licenses.asl20; + platforms = platforms.linux; maintainers = with maintainers; [ wucke13 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix index 1e9df5be23..4b5f277fc5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; license = licenses.boost; platforms = platforms.all; - maintainers = with maintainers; [ primeos xwvvvvwx ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 6ab2fe9f6c..ef4271ee96 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.17.3"; + version = "6.23.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM="; + sha256 = "0ivdcc012c35f2wcc5qzic2jlrwp4whyz5sbz1nyfyrnv0xf5djw"; }; nativeBuildInputs = [ cmake ninja ]; @@ -60,7 +60,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; + changelog = "https://github.com/facebook/rocksdb/raw/v${version}/HISTORY.md"; license = licenses.asl20; + platforms = platforms.all; maintainers = with maintainers; [ adev magenbluten ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix new file mode 100644 index 0000000000..1130f5c44e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -0,0 +1,68 @@ +{ lib, stdenv, fetchFromGitHub, cmake, zlib, eigen, libGL, doxygen, spglib +, mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook +}: + +let + pythonWP = python3.withPackages (p: with p; [ openbabel-bindings numpy ]); + + # Pure data repositories + moleculesRepo = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "molecules"; + rev = "1.0.0"; + sha256 = "guY6osnpv7Oqt+HE1BpIqL10POp+x8GAci2kY0bLmqg="; + }; + crystalsRepo = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "crystals"; + rev = "1.0.1"; + sha256 = "sH/WuvLaYu6akOc3ssAKhnxD8KNoDxuafDSozHqJZC4="; + }; + +in stdenv.mkDerivation rec { + pname = "avogadrolibs"; + version = "1.94.0"; + + src = fetchFromGitHub { + owner = "OpenChemistry"; + repo = pname; + rev = version; + sha256 = "6bChJhqrjOxeEWZBNToq3JExHPu7DUMsEHWBDe75zAo="; + }; + + postUnpack = '' + cp -r ${moleculesRepo} molecules + cp -r ${crystalsRepo} crystals + ''; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + eigen + zlib + libGL + spglib + mmtf-cpp + glew + libarchive + libmsym + msgpack + qttools + ]; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsConfig.cmake \ + --replace "''${AvogadroLibs_INSTALL_PREFIX}/$out" "''${AvogadroLibs_INSTALL_PREFIX}" + ''; + + meta = with lib; { + description = "Molecule editor and visualizer"; + maintainers = with maintainers; [ sheepforce ]; + homepage = "https://github.com/OpenChemistry/avogadrolibs"; + platforms = platforms.linux; + license = licenses.gpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libmsym/default.nix new file mode 100644 index 0000000000..8c605f3e07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/libmsym/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake } : + +stdenv.mkDerivation rec { + pname = "libmsym"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "mcodev31"; + repo = pname; + rev = "v${version}"; + sha256= "k+OEwrA/saupP/wX6Ii5My0vffiJ0X9xMCTrliMSMik="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = " molecular point group symmetry lib"; + homepage = "https://github.com/rcsb/mmtf-cpp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix new file mode 100644 index 0000000000..ec1fed68ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake, msgpack } : + +stdenv.mkDerivation rec { + pname = "mmtf-cpp"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "rcsb"; + repo = pname; + rev = "v${version}"; + sha256= "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ msgpack ]; + + meta = with lib; { + description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + homepage = "https://github.com/rcsb/mmtf-cpp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix new file mode 100644 index 0000000000..1e8ca2d961 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, cmake, qttools, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "molequeue"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "OpenChemistry"; + repo = pname; + rev = version; + sha256 = "+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ qttools ]; + + postFixup = '' + substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \ + --replace "''${MoleQueue_INSTALL_PREFIX}/$out" "''${MoleQueue_INSTALL_PREFIX}" + ''; + + meta = with lib; { + description = "Desktop integration of high performance computing resources"; + maintainers = with maintainers; [ sheepforce ]; + homepage = "https://github.com/OpenChemistry/molequeue"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix index c849739199..ed957f9577 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchFromGitea , meson , ninja }: @@ -9,18 +9,23 @@ stdenv.mkDerivation rec { pname = "tllist"; version = "1.0.5"; - src = fetchgit { - url = "https://codeberg.org/dnkl/tllist.git"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "tllist"; rev = version; sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; }; nativeBuildInputs = [ meson ninja ]; + mesonBuildType = "release"; + doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/tllist"; + changelog = "https://codeberg.org/dnkl/tllist/releases/tag/${version}"; description = "C header file only implementation of a typed linked list"; longDescription = '' Most C implementations of linked list are untyped. That is, their data diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index c571e22384..a5553dd0d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -26,7 +26,6 @@ , json-glib , libcue , libexif -, libgrss , libgsf , libgxps , libiptcdata @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { json-glib libcue libexif - libgrss libgsf libgxps libiptcdata @@ -108,6 +106,11 @@ stdenv.mkDerivation rec { mesonFlags = [ # TODO: tests do not like our sandbox "-Dfunctional_tests=false" + + # libgrss is unmaintained and has no new releases since 2015, and an open + # security issue since then. Despite a patch now being availab, we're opting + # to be safe due to the general state of the project + "-Dminer_rss=false" ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 563c13b26f..72b09fec29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -82,12 +82,6 @@ stdenv.mkDerivation rec { }) ./libglvnd-headers.patch ] ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff"; - sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA="; - excludes = [ "Source/WebKit/ChangeLog" ]; - }) - # https://bugs.webkit.org/show_bug.cgi?id=225856 (fetchpatch { url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix index df36f48648..aa924e755d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -1,7 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, cmake, orcania, systemd, check, subunit +{ stdenv +, lib +, fetchFromGitHub +, cmake +, orcania +, systemd +, check +, subunit , withSystemd ? stdenv.isLinux }: -assert withSystemd -> systemd != null; + stdenv.mkDerivation rec { pname = "yder"; version = "1.4.12"; @@ -21,7 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ orcania ] ++ lib.optional withSystemd systemd; + buildInputs = [ orcania ] + ++ lib.optional withSystemd systemd; checkInputs = [ check subunit ]; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix index 69872eb41a..83f3347bdf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; - phases="installPhase fixupPhase"; + dontUnpack = true; ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; diff --git a/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix b/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix index 4b5793dc13..d8f75875b9 100644 --- a/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/avr8-burn-omat/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; - # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 0ba7fd8a62..eacd0c89d9 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -77,6 +77,7 @@ , "create-react-native-app" , "csslint" , "dat" +, "degit" , "dhcp" , "diagnostic-languageserver" , "dockerfile-language-server-nodejs" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 55eaf452ab..e00b4d1081 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -2074,22 +2074,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.6" = { + "@expo/config-5.0.7" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.6.tgz"; - sha512 = "KnSEmlRYT4AsxOGa2OPEefeCEJSo4oMZI/2q3/vriiSYlI2J12/YZz2QaZtGUfKD6jm+5hCerYRQcAMhzj5/BA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.7.tgz"; + sha512 = "7Wzao9uALHmRSf59FMsHk1vxW4m4alDCJmfo+enXnl5o6UYiCDYfjNXctMwnW+fBM3opta4FbmmPGIftfXOesw=="; }; }; - "@expo/config-plugins-3.0.6" = { + "@expo/config-plugins-3.0.7" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.6.tgz"; - sha512 = "hJfxEWfsWuqt4WG3X2F74+tL1JrXZomRBgShKLTMw1vvLe4md70rjTLbmaHkcGb+TfY3RtFZSK8p9oqFXCi8KA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.7.tgz"; + sha512 = "7YOoFtxB6XqDil+OlGXi7iredKHxXVFCAOIVfFyEDzO3oo0gBmWGmUnHgrPDvpMj0q+adCCh5BL8OcvGfc9ITQ=="; }; }; "@expo/config-types-42.0.0" = { @@ -2101,22 +2101,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.81" = { + "@expo/dev-server-0.1.82" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.81"; + version = "0.1.82"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.81.tgz"; - sha512 = "N/NeD/40aUCVM1m8BFlkQggLiy1HeL0SHx/6SXzyXZNCqcA2TdsZ3RGcvLG2RZlPBknSSixufaABQF482yL3fQ=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.82.tgz"; + sha512 = "g7H4FDxcdt9y41MpivtpYqgNwEqoaSKA+lrR+qPCVPcZbIcq+xRq/coYfeXhp/L203vAab67cNVnqTQetj1T3A=="; }; }; - "@expo/dev-tools-0.13.112" = { + "@expo/dev-tools-0.13.113" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.112"; + version = "0.13.113"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.112.tgz"; - sha512 = "lUjC0Q6HeNGuwLkV3fIeexhx7ccx1+OCd7W6m2g+eGF0hMPKHPfrUED4Q1Sin/Y9d7yZxQqwzCIOMfxzaZ2GxA=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.113.tgz"; + sha512 = "3z1gIBSnDATukcyvN1Q6ywT5FExJrf/wfg+1T0nQ8OZcyzFbi6u/tdns0mjT5Z+AyXDKtyHbQzGnRzegy82i3Q=="; }; }; "@expo/devcert-1.0.0" = { @@ -2137,22 +2137,22 @@ let sha512 = "ZggQK5w7awqYdA/TE0DT02nYxWirQm2r7NNy043zVtzBCtjhLpFpluk1v9W0pH4+nT1ChGk1c67j0mYRKcBkjg=="; }; }; - "@expo/json-file-8.2.32" = { + "@expo/json-file-8.2.33" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.32"; + version = "8.2.33"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.32.tgz"; - sha512 = "VnpoEnjMptBQr/zgkfGHd7L8iJBme9g2AVpUIecI+aoW6qmeIRbBViPmyNABgH4UUQn3ObQCxe+q1dAdJo8KGg=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.33.tgz"; + sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.1.81" = { + "@expo/metro-config-0.1.82" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.81"; + version = "0.1.82"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.81.tgz"; - sha512 = "Ta95ohtPChXnuZsCEqMMl4yWqt5hThEY1VULLMe19kT4dPa/rEQ72rtRzpDFH7adNQBRrahTz7kx9rWj6YO+MA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.82.tgz"; + sha512 = "rgx0ykWFvu+7jXDSe/cJB0fpIKqJX4X2k+azBIS9KmVLl5/ceKuCr6Abjy70HZTAXX/SQ7fS0C+FhzIX2Upgrg=="; }; }; "@expo/osascript-2.0.30" = { @@ -2164,13 +2164,13 @@ let sha512 = "IlBCyso1wJl8AbgS8n5lcUcXa/8TTU/rHgurWvJRWjErtFOELsqV4O+NCcB7jr4bvv8uZHeRKHQpsoyZWmmk/g=="; }; }; - "@expo/package-manager-0.0.45" = { + "@expo/package-manager-0.0.46" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.45"; + version = "0.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.45.tgz"; - sha512 = "UxQxRVBKkHCd4c5otoigRFQ7tkP/EyP58ZVQ0QN5SpsUULmyKmpPFzvELoOuPsYCgSioyvmwpYe2bMEt07oJJA=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.46.tgz"; + sha512 = "+Mo7UzRNUy52uzefRkeKv8+YEE+2NhBpXfvZ1Btha2/zSJ+8fxDT0mTQUiupiaeMRPyCMqdkoE39qjF26xifYA=="; }; }; "@expo/plist-0.0.13" = { @@ -2182,13 +2182,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.6" = { + "@expo/prebuild-config-2.0.7" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.6.tgz"; - sha512 = "eJHkTFmLwD0llfZMo1eGQNhd50cSmqWrPLcOoY7w1nSwfwYKa6/H18XwQ3ZbTsLf44Ai/Uj8JeI3HClEFYMsxw=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.7.tgz"; + sha512 = "EMgo4ywR9hk+I90XEwtl/UHWOlw8GE01BQtrLWQbIR0pr+bvDOYINfe8PzA21oODPGUkbMvp5Z8E79VZBqqjfg=="; }; }; "@expo/results-1.0.0" = { @@ -2227,13 +2227,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.13.3" = { + "@expo/webpack-config-0.14.0" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.13.3"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.3.tgz"; - sha512 = "ja4oGqIpS5K9dqPysAudQYp8Nd/sm0ojXRCIequO4fcePM8JNLQ4D8vbM2ahl6osODAJqpOumH2UlB1pTnSZrA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.14.0.tgz"; + sha512 = "YsWLjOQIUN/+pJ5CEmhWfERwjpp6KGjxbd2Nm2KWx4v69wphyPudyrKJaD/b/41Iw5TKHGjV3hlHrYWvZ6OFaA=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2785,15 +2785,6 @@ let sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/formula-1.2.0" = { - name = "_at_hapi_slash_formula"; - packageName = "@hapi/formula"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz"; - sha512 = "UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA=="; - }; - }; "@hapi/hoek-8.5.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; @@ -2821,24 +2812,6 @@ let sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; - "@hapi/joi-16.1.8" = { - name = "_at_hapi_slash_joi"; - packageName = "@hapi/joi"; - version = "16.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz"; - sha512 = "wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg=="; - }; - }; - "@hapi/pinpoint-1.0.2" = { - name = "_at_hapi_slash_pinpoint"; - packageName = "@hapi/pinpoint"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz"; - sha512 = "dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ=="; - }; - }; "@hapi/topo-3.1.6" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; @@ -3955,13 +3928,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-17.9.0" = { + "@netlify/build-17.9.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "17.9.0"; + version = "17.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.0.tgz"; - sha512 = "RaDv21H391dkVciAMATG2PkSpcG0qcnAVlwsBSx7Yb1rHrUhynxkY9jTWmn1P4ufWfPoykIDPRG7n/BRVA/Iqg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.2.tgz"; + sha512 = "RbaHBWkbrwiXdLf73gjcjJAn7z3zsRqhXqaF2K9ycru7K7XIVG/BGEKztSD8IoAYR2DuY9KqmrlbPuiQg0IFFg=="; }; }; "@netlify/cache-utils-2.0.0" = { @@ -3973,13 +3946,13 @@ let sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ=="; }; }; - "@netlify/config-14.4.1" = { + "@netlify/config-14.4.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "14.4.1"; + version = "14.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.1.tgz"; - sha512 = "30H92pQajmBo6dU+LOXDpa0dC7EKVDmncED6itzMME46bn6hySKswrY524fP6ArAF/g+LJD6Uhf4AlWNDnz3Fw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz"; + sha512 = "lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4414,6 +4387,15 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; + "@oclif/core-0.5.28" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "0.5.28"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.28.tgz"; + sha512 = "t9jaGLRP5yJKwiMIzKmzYyP1eRxltWAY02lduUDp3d6cE+Dt2pcIGd7KtsOImKUWv+ClLI7O/CVHnMkOfNJvYA=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -4459,13 +4441,13 @@ let sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw=="; }; }; - "@oclif/plugin-help-3.2.2" = { + "@oclif/plugin-help-3.3.0" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz"; - sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.3.0.tgz"; + sha512 = "+eYQZXsWnc54IM5Hv2+IoKBTKUSDt+vRbwf5I8w+DaXvzOmx0VzAbLgL1ciJzYh66CknjWMUJf/hxoc8ykJHaQ=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -5323,15 +5305,6 @@ let sha512 = "eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w=="; }; }; - "@rollup/plugin-replace-2.4.2" = { - name = "_at_rollup_slash_plugin-replace"; - packageName = "@rollup/plugin-replace"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; - sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; - }; - }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -5953,15 +5926,6 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@surma/rollup-plugin-off-main-thread-1.4.2" = { - name = "_at_surma_slash_rollup-plugin-off-main-thread"; - packageName = "@surma/rollup-plugin-off-main-thread"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz"; - sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A=="; - }; - }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -6709,13 +6673,13 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-assert-1.5.1" = { + "@types/http-assert-1.5.2" = { name = "_at_types_slash_http-assert"; packageName = "@types/http-assert"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz"; - sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="; + url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.2.tgz"; + sha512 = "Ddzuzv/bB2prZnJKlS1sEYhaeT50wfJjhcTTTQLjEsEZJlk3XB4Xohieyq+P4VXIzg7lrQ1Spd/PfRnBpQsdqA=="; }; }; "@types/http-cache-semantics-4.0.1" = { @@ -7150,13 +7114,22 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; - "@types/node-16.4.12" = { + "@types/node-16.4.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.4.12"; + version = "16.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz"; - sha512 = "zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz"; + sha512 = "bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg=="; + }; + }; + "@types/node-16.4.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.3.tgz"; + sha512 = "GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg=="; }; }; "@types/node-6.14.13" = { @@ -7555,13 +7528,13 @@ let sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; }; }; - "@types/vscode-1.58.1" = { + "@types/vscode-1.59.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.58.1"; + version = "1.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.1.tgz"; - sha512 = "sa76rDXiSif09he8KoaWWUQxsuBr2+uND0xn1GUbEODkuEjp2p7Rqd3t5qlvklfmAedLFdL7MdnsPa57uzwcOw=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.59.0.tgz"; + sha512 = "Zg38rusx2nU6gy6QdF7v4iqgxNfxzlBlDhrRCjOiPQp+sfaNrp3f9J6OHIhpGNN1oOAca4+9Hq0+8u3jwzPMlQ=="; }; }; "@types/webpack-4.41.30" = { @@ -7573,13 +7546,13 @@ let sha512 = "GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA=="; }; }; - "@types/webpack-sources-2.1.1" = { + "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "2.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz"; - sha512 = "MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; }; }; "@types/websocket-1.0.2" = { @@ -7897,49 +7870,49 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vercel/build-utils-2.11.1" = { + "@vercel/build-utils-2.12.1" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "2.11.1"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.11.1.tgz"; - sha512 = "4eVUV7az4c/Avb9tdkoeJf8EYXW4mSY42ZQh15WRUkEXZq80FAgmywrklKOt3B/J+DW6fn8R4exuI1yXnu2iJg=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.12.1.tgz"; + sha512 = "85FUGmNQWL+gWORGIfW2amNeDt3vBgliZ51j3D9s+2qcAv+Li+ghLfzjoP5w5E+DhO8OxHfy53WbqR5aprAWEA=="; }; }; - "@vercel/go-1.2.2" = { + "@vercel/go-1.2.3" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.2.tgz"; - sha512 = "Oo1lXjXmDrSqdF3LKCWXJGU9DInq5aMe6weQSoWnKRvSZ6v4at2x19ltHYvgUO95y4tbdzqPLRKFNUSQEJVdjQ=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.3.tgz"; + sha512 = "BZCHRz43Qfr0DwZlZQCcofR+3cr+H+HK72/ZPkZy1Uq0NYjJMlmZ3ahuMgvJxT9lfC1RA6eOEUlUsZ+gqKcMCg=="; }; }; - "@vercel/node-1.11.1" = { + "@vercel/node-1.12.0" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-1.11.1.tgz"; - sha512 = "2OheDtjxr1OkYyvMh7laDkOA4K6KfLL60IBg1D+PksNri2YEFaPK1lzdq7xuByuDRUs+tm9U57sPVAlyzGjlvw=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-1.12.0.tgz"; + sha512 = "McwhEg6KI0y7R875IG87Ry3HrFvws+60/yKk1KqJxbOud/n/Mj9eEZTI5mxxMFj8tT7KhmFaRdl8pJz8ISR1Cg=="; }; }; - "@vercel/python-2.0.4" = { + "@vercel/python-2.0.5" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.4.tgz"; - sha512 = "pGHtsbF2gVHnZGw62HIUZhfGzO+jXGprFsmgJwHdDWkUjiVGGKpbMKiDZlZPJQF7FC4xTF4rb0JKzrcckrpYXg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.5.tgz"; + sha512 = "WCSTTw6He2COaSBiGDk2q5Q1ue+z5usRZcvUHCpsK6KvNkkV/PrY8JT73XQysMWKiXh6yQy19IUFAOqK/xwhig=="; }; }; - "@vercel/ruby-1.2.6" = { + "@vercel/ruby-1.2.7" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.6.tgz"; - sha512 = "ZLDMxMvOL0xd7FBHXQJ9EJxPohw+qzpgwulaNhXGgPuFUfnS9mboUEyj0sU9A9F7lMJFPJ6gs8UfVxBY2eNnGA=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.7.tgz"; + sha512 = "ZG2VxMHHSKocL57UWsfNc9UsblwYGm55/ujqGIBnkNUURnRgtUrwtWlEts1eJ4VHD754Lc/0/R1pfJXoN5SbRw=="; }; }; "@vue/cli-shared-utils-4.5.13" = { @@ -8527,13 +8500,13 @@ let sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; }; }; - "@wry/context-0.6.0" = { + "@wry/context-0.6.1" = { name = "_at_wry_slash_context"; packageName = "@wry/context"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@wry/context/-/context-0.6.0.tgz"; - sha512 = "sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q=="; + url = "https://registry.npmjs.org/@wry/context/-/context-0.6.1.tgz"; + sha512 = "LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw=="; }; }; "@wry/equality-0.1.11" = { @@ -8545,22 +8518,22 @@ let sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="; }; }; - "@wry/equality-0.5.1" = { + "@wry/equality-0.5.2" = { name = "_at_wry_slash_equality"; packageName = "@wry/equality"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.1.tgz"; - sha512 = "FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw=="; + url = "https://registry.npmjs.org/@wry/equality/-/equality-0.5.2.tgz"; + sha512 = "oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA=="; }; }; - "@wry/trie-0.3.0" = { + "@wry/trie-0.3.1" = { name = "_at_wry_slash_trie"; packageName = "@wry/trie"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.0.tgz"; - sha512 = "Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug=="; + url = "https://registry.npmjs.org/@wry/trie/-/trie-0.3.1.tgz"; + sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -11065,6 +11038,15 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; + "async-3.2.1" = { + name = "async"; + packageName = "async"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.1.tgz"; + sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; + }; + }; "async-append-only-log-3.0.9" = { name = "async-append-only-log"; packageName = "async-append-only-log"; @@ -11389,13 +11371,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.961.0" = { + "aws-sdk-2.963.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.961.0"; + version = "2.963.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.961.0.tgz"; - sha512 = "71ELXHWd0roRT0FW8CnqGLYGKLksHARa7Yn8LPN3mF70FJt2LuvVAyK49IChoUczTjlzS78p+Y5197Tkky4N8g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.963.0.tgz"; + sha512 = "EY7EPap1c/1RxPx+Py56t9btJug3Z3PJkCfplqzNuU1QlFGs+rN8yYm9xIn8J6gbJ5D8F4Qab0GCtTmGstlHfQ=="; }; }; "aws-sign2-0.6.0" = { @@ -14953,6 +14935,15 @@ let sha512 = "rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA=="; }; }; + "cbor-8.0.0" = { + name = "cbor"; + packageName = "cbor"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-8.0.0.tgz"; + sha512 = "nMmaLWbj7+bC6MsApKRIig8h+yjgNLhPLXaCelq5+C7mpWsHgIcseZSdvgexSY5uE1Q3m2uPvIDZwSdxdo7qig=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -17266,13 +17257,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-10.0.1" = { + "conf-10.0.2" = { name = "conf"; packageName = "conf"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-10.0.1.tgz"; - sha512 = "QClEoNcruwBL84QgMEPHibL3ERxWIrRKhbjJKG1VsFBadm5QpS0jsu4QjY/maxUvhyAKXeyrs+ws+lC6PajnEg=="; + url = "https://registry.npmjs.org/conf/-/conf-10.0.2.tgz"; + sha512 = "iyy4ArqyQ/yrzNASNBN+jaylu53JRuq0ztvL6KAWYHj4iN56BVuhy2SrzEEHBodNbacZr2Pd/4nWhoAwc66T1g=="; }; }; "conf-6.2.4" = { @@ -17509,13 +17500,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.114" = { + "constructs-3.3.117" = { name = "constructs"; packageName = "constructs"; - version = "3.3.114"; + version = "3.3.117"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.114.tgz"; - sha512 = "J1R3RypQsCBvZ4zUpogIunj8ShpU4GC73mmHFPmOp7HgxHKYEOpukYAe5VL84pnsoQxv1tnM3EJcScPh/EEQQw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.117.tgz"; + sha512 = "y5PVROPr7XFlz2/ZAXNHhkb8Y7HzJs4kBrUcjI5B5tbQz/YXsOmZV73AGRYDiUvMstqvpq+UOVBhL3zoA9vg7Q=="; }; }; "consume-http-header-1.0.0" = { @@ -18329,13 +18320,13 @@ let sha512 = "dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw=="; }; }; - "create-torrent-4.7.2" = { + "create-torrent-5.0.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.7.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.7.2.tgz"; - sha512 = "8T5zMK0WhOfm2QubE/ZFVxaoCmhZk6I01ze53MIIe1HI0dxsvYohkNtFXEHL5oXi1vkbJOD/yLVJuUc4cCziog=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; + sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; }; }; "cron-1.8.2" = { @@ -19859,13 +19850,13 @@ let sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; - "deasync-0.1.21" = { + "deasync-0.1.22" = { name = "deasync"; packageName = "deasync"; - version = "0.1.21"; + version = "0.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.21.tgz"; - sha512 = "kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.22.tgz"; + sha512 = "o21R8Vhv3wX0E19jpATUJIAinQ1I2rHIlAnzRRsMynWlIrvU0HbCwjpquPIYR544Tvg9z/L+NZQev5cjVD1/nQ=="; }; }; "death-1.1.0" = { @@ -22100,15 +22091,6 @@ let sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; - "ecstatic-3.3.2" = { - name = "ecstatic"; - packageName = "ecstatic"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz"; - sha512 = "fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog=="; - }; - }; "ecstatic-4.1.4" = { name = "ecstatic"; packageName = "ecstatic"; @@ -22190,13 +22172,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-notarize-1.0.1" = { + "electron-notarize-1.1.0" = { name = "electron-notarize"; packageName = "electron-notarize"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.1.tgz"; - sha512 = "5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg=="; + url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.0.tgz"; + sha512 = "Dmp/jm2y3PTcjmjVe+jCT0sjsbBfbNuk7GOPtduZce2iae1hgAPnlNErk6x70TalsGIL5Ip3liSryqde/6eB5w=="; }; }; "electron-osx-sign-0.5.0" = { @@ -22226,13 +22208,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.796" = { + "electron-to-chromium-1.3.799" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.796"; + version = "1.3.799"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz"; - sha512 = "agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz"; + sha512 = "V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24163,13 +24145,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.91" = { + "expo-pwa-0.0.92" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.91"; + version = "0.0.92"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.91.tgz"; - sha512 = "hwi3eJhL85yHZBvv5ekdS0A1721wmgNAM53LMv5meawTBy5W0NNg8E6Ey+N3UCrL6BP1Kk7WByxX4V4kkzGV8A=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.92.tgz"; + sha512 = "lY+m28IQkqpCPZQdAlMBUGgm5HbTEHVaMNt0QnMAeX/siN11rfhxBr2nFQRYfK0R5Kklh6yUTyAjz+vOd2bSKw=="; }; }; "express-2.5.11" = { @@ -25765,13 +25747,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.156.0" = { + "flow-parser-0.157.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.156.0"; + version = "0.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.156.0.tgz"; - sha512 = "OCE3oIixhOttaV4ahIGtxf9XfaDdxujiTnXuHu+0dvDVVDiSDJlQpgCWdDKqP0OHfFnxQKrjMamArDAXtrBtZw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.157.0.tgz"; + sha512 = "p0vdtrM8oAMlscIXpX0e/eGWll5NPteVChNtlQncbIbivH+BdiwXHN5QO6myAfmebd027r9RiQKdUPsFAiEVgQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26971,15 +26953,6 @@ let sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; - "get-own-enumerable-property-symbols-3.0.2" = { - name = "get-own-enumerable-property-symbols"; - packageName = "get-own-enumerable-property-symbols"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; - }; - }; "get-package-info-1.0.0" = { name = "get-package-info"; packageName = "get-package-info"; @@ -27917,13 +27890,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.21.1" = { + "google-gax-2.22.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.21.1"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.21.1.tgz"; - sha512 = "hyfau8+yXt75UuYVP3E3n0pKUwsEyiVQXfozfqQn/ZOL36UoZtS/cIzqIm6SYaSLlK5MWWz3JT/o/1ol09gEbA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.22.1.tgz"; + sha512 = "/X5Ym6f6Q4sH/3blMr1w/QzFhH0ZKnx9kOusUPwwZH6JmSwLpbuyUDbOc7MAvadl4r7yI2AASILLWK3fT+1Thg=="; }; }; "google-p12-pem-3.1.1" = { @@ -28070,13 +28043,13 @@ let sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; }; }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "graceful-readlink-1.0.1" = { @@ -28754,6 +28727,15 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -31473,13 +31455,13 @@ let sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A=="; }; }; - "is-arguments-1.1.0" = { + "is-arguments-1.1.1" = { name = "is-arguments"; packageName = "is-arguments"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; - sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; "is-arrayish-0.2.1" = { @@ -31509,13 +31491,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.2" = { + "is-bigint-1.0.3" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz"; - sha512 = "0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz"; + sha512 = "ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg=="; }; }; "is-binary-path-1.0.1" = { @@ -31536,13 +31518,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.1.1" = { + "is-boolean-object-1.1.2" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; - sha512 = "bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; "is-buffer-1.1.6" = { @@ -31563,13 +31545,13 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; - "is-callable-1.2.3" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-canonical-base64-1.1.1" = { @@ -31644,13 +31626,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.4" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz"; - sha512 = "/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-decimal-1.0.4" = { @@ -31860,13 +31842,13 @@ let sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; - "is-generator-function-1.0.9" = { + "is-generator-function-1.0.10" = { name = "is-generator-function"; packageName = "is-generator-function"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz"; - sha512 = "ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A=="; + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; }; }; "is-glob-2.0.1" = { @@ -32139,13 +32121,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.5" = { + "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz"; - sha512 = "RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; }; "is-obj-1.0.1" = { @@ -32373,13 +32355,13 @@ let sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; - "is-regex-1.1.3" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz"; - sha512 = "qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; "is-regexp-1.0.0" = { @@ -32526,13 +32508,13 @@ let sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; }; }; - "is-string-1.0.6" = { + "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz"; - sha512 = "2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; "is-supported-regexp-flag-1.0.1" = { @@ -32562,13 +32544,13 @@ let sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; }; }; - "is-typed-array-1.1.5" = { + "is-typed-array-1.1.7" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz"; - sha512 = "S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz"; + sha512 = "VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA=="; }; }; "is-typedarray-1.0.0" = { @@ -33660,13 +33642,13 @@ let sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ=="; }; }; - "jsii-srcmak-0.1.316" = { + "jsii-srcmak-0.1.319" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.316"; + version = "0.1.319"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.316.tgz"; - sha512 = "hJhok9bx0izVqXbfQ/A5Y8n6buUovbl5I3mozAFS8SM2z/RJCVf1ZaBui8yRUhWVADaZ0DsXB5ps40acdWNU3A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.319.tgz"; + sha512 = "6FxGDXgt2utZnz0NC/wrBiILM3ZxQXsJF6eflNcadkhKhcjOwe9qCxSZWs6eDwJq6REckVn24iy+8H6pdpHbog=="; }; }; "json-bigint-0.2.3" = { @@ -33975,13 +33957,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.286" = { + "json2jsii-0.1.289" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.286"; + version = "0.1.289"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.286.tgz"; - sha512 = "AD0Ip07hdVs6VrrNUxi6vy7zLuAXmS231/DqfQFCF2zwSkaqMO1cK/OhfDiKafkspZoadwTR/cyQXBXlCsOPpQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.289.tgz"; + sha512 = "HzFig1AW9qqN0Po2qLB3CD6C+UJcAA2dU+0kmpuOtY79WMVaKahj7yHQDvf0yZoEbFO5T4RyMwYyOCMOpCgY5w=="; }; }; "json3-3.2.6" = { @@ -34290,6 +34272,15 @@ let sha512 = "Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw=="; }; }; + "jszip-3.7.1" = { + name = "jszip"; + packageName = "jszip"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; + sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; + }; + }; "junk-3.1.0" = { name = "junk"; packageName = "junk"; @@ -35362,6 +35353,15 @@ let sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; }; }; + "lightning-3.5.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.5.0.tgz"; + sha512 = "6Kj1JX8tG3JiV5LXYGuZkKckiRJ/OU8ukb/R5qsp7RWq/xw32LDccCKvOK8oRnOGw9K+G8jcZAOY21exr9OSFA=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35515,13 +35515,13 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; - "ln-service-51.10.0" = { + "ln-service-51.10.1" = { name = "ln-service"; packageName = "ln-service"; - version = "51.10.0"; + version = "51.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; - sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.1.tgz"; + sha512 = "fXsA/gDh65+YYVYJ6GNDB2ALPa0rjXV59I9kgciOCkgiJo3F7AYkhNULYIGu0r2FK83J1M85AsH6tycImRVWRQ=="; }; }; "ln-service-51.8.2" = { @@ -39043,13 +39043,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.11.3" = { + "mermaid-8.11.4" = { name = "mermaid"; packageName = "mermaid"; - version = "8.11.3"; + version = "8.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.3.tgz"; - sha512 = "XhfSF+crAX+BhxyKUL28Pf0Of12bby+jK2VQ05xSLZ/pYE6kVfiTuO1mTA5chnqDdz9xpD9A77pTWHv27IbWsg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.4.tgz"; + sha512 = "iUJylv5VmsOm/6dkAVpSYRSD8iZ8NOjuiHG0Q6nMgPdmmQ9xy8z61v8MuRZn81K51JlvOeWMN06blejmsMQHqg=="; }; }; "meros-1.1.4" = { @@ -41321,13 +41321,13 @@ let sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; }; }; - "netlify-redirect-parser-8.1.0" = { + "netlify-redirect-parser-8.2.0" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.1.0.tgz"; - sha512 = "y5uzRHSyHVDDIgcFwvRRIELliBc7SKFuvuyVgsIMZWaNDCKNO4Etk2CIeGlJG+++g7NFD/XlYJaqgw2jJkqe4A=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz"; + sha512 = "XaCojsgAKs19vlT2C4CEs4bp166bBsgA/brt10x2HLsgp4tF3dSacClPfZgGknyHB1MnMK8j3SFp9yq6rYm8CQ=="; }; }; "netlify-redirector-0.2.1" = { @@ -42096,6 +42096,15 @@ let sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; }; }; + "nofilter-3.0.3" = { + name = "nofilter"; + packageName = "nofilter"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nofilter/-/nofilter-3.0.3.tgz"; + sha512 = "TN/MCrQmXQk5DyUJ8TGUq1Il8rv4fTsjddLmMopV006QP8DMkglmGgYfQKD5620vXLRXfr8iGI6ZZ4/ZWld2cQ=="; + }; + }; "noise-peer-2.1.1" = { name = "noise-peer"; packageName = "noise-peer"; @@ -47921,6 +47930,15 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; + "proto3-json-serializer-0.1.1" = { + name = "proto3-json-serializer"; + packageName = "proto3-json-serializer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.1.tgz"; + sha512 = "Wucuvf7SqAw1wcai0zV+3jW3QZJiO/W9wZoJaTheebYdwfj2k9VfF3Gw9r2vGAaTeslhMbkVbojJG0+LjpgLxQ=="; + }; + }; "protobufjs-3.8.2" = { name = "protobufjs"; packageName = "protobufjs"; @@ -49037,13 +49055,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.159" = { + "pyright-1.1.160" = { name = "pyright"; packageName = "pyright"; - version = "1.1.159"; + version = "1.1.160"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz"; - sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz"; + sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA=="; }; }; "q-0.9.7" = { @@ -52430,6 +52448,15 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; + "rollup-2.51.1" = { + name = "rollup"; + packageName = "rollup"; + version = "2.51.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz"; + sha512 = "8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw=="; + }; + }; "rollup-2.56.0" = { name = "rollup"; packageName = "rollup"; @@ -54419,13 +54446,13 @@ let sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; - "smart-buffer-4.1.0" = { + "smart-buffer-4.2.0" = { name = "smart-buffer"; packageName = "smart-buffer"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz"; - sha512 = "iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; }; "smartdc-auth-2.3.1" = { @@ -55229,15 +55256,6 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; - "source-map-0.8.0-beta.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.8.0-beta.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - }; "source-map-js-0.6.2" = { name = "source-map-js"; packageName = "source-map-js"; @@ -56048,13 +56066,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.37" = { + "sscaff-1.2.40" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.37"; + version = "1.2.40"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.37.tgz"; - sha512 = "TPvwDnZgM8cPkNtkESjJQ9dCajib2T1YBC763//zVlKsLrJJN3xAwoAQXfey7BdYCCB7DyXKHgtyhKLq0TZl+A=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.40.tgz"; + sha512 = "XAt/qwEqrzt7uXEkhLW1oVXi1f/Q1qtTaw8TjIuRjryNpbzF0mvFvag4rF/2jWdWC/TJ7HIQXx3mAce3rPb45A=="; }; }; "ssh-config-1.1.6" = { @@ -56993,15 +57011,6 @@ let sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; }; }; - "stringify-object-3.3.0" = { - name = "stringify-object"; - packageName = "stringify-object"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; - }; - }; "stringify-package-1.0.1" = { name = "stringify-package"; packageName = "stringify-package"; @@ -57173,15 +57182,6 @@ let sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; }; }; - "strip-comments-2.0.1" = { - name = "strip-comments"; - packageName = "strip-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"; - sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; - }; - }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -58497,15 +58497,6 @@ let sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; }; }; - "tempy-0.6.0" = { - name = "tempy"; - packageName = "tempy"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz"; - sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; - }; - }; "tempy-0.7.1" = { name = "tempy"; packageName = "tempy"; @@ -60576,15 +60567,6 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-3.9.3" = { - name = "typescript"; - packageName = "typescript"; - version = "3.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz"; - sha512 = "D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ=="; - }; - }; "typescript-4.0.3" = { name = "typescript"; packageName = "typescript"; @@ -60603,6 +60585,15 @@ let sha512 = "pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow=="; }; }; + "typescript-4.3.4" = { + name = "typescript"; + packageName = "typescript"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; + sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + }; + }; "typescript-4.3.5" = { name = "typescript"; packageName = "typescript"; @@ -64177,13 +64168,13 @@ let sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; }; }; - "web3-utils-1.5.0" = { + "web3-utils-1.5.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.0.tgz"; - sha512 = "hNyw7Oxi6TM3ivXmv4hK5Cvyi9ML3UoKtcCYvLF9woPWh5v2dwCCVO1U3Iq5HHK7Dqq28t1d4CxWHqUfOfAkgg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.1.tgz"; + sha512 = "U8ULaMBwjkp9Rn+kRLjUmgAUHwPqDrM5/Q9tPKgvuDKtMWUggTLC33/KF8RY+PyAhSAlnD+lmNGfZnbjmVKBxQ=="; }; }; "webassemblyjs-1.11.1" = { @@ -64276,13 +64267,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.48.0" = { + "webpack-5.49.0" = { name = "webpack"; packageName = "webpack"; - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz"; - sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz"; + sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -64474,13 +64465,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.3.7" = { + "webtorrent-1.3.9" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.3.7"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.7.tgz"; - sha512 = "0dabc5WmYyuAchbsyugcVPvFeuyrig32cacPK+rvK71WUN80Q5nJOHj4YP+ZnIJMjjJ0LOOvdTdNo5ZPDGqjtQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.3.9.tgz"; + sha512 = "K52E15SutGIgrBj0YzYNYgkuQMucKePdGk2zxMwLHtFh9sJ0KVPlQgkmORhSbJqC51cRVq/4Xt2jToZde8ioRQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -64672,13 +64663,13 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; - "which-typed-array-1.1.4" = { + "which-typed-array-1.1.6" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz"; - sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz"; + sha512 = "DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q=="; }; }; "wide-align-1.1.3" = { @@ -64735,13 +64726,13 @@ let sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA=="; }; }; - "wikipeg-2.0.5" = { + "wikipeg-2.0.6" = { name = "wikipeg"; packageName = "wikipeg"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.5.tgz"; - sha512 = "FMNznSW4Qjexmgqz23YLtXoS6+GKPnbkEsI14xdRxsWv8jQWJ94ffQZ4PpUSsZm7/XAjqrjFiUnbvOOxBhJY4g=="; + url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.6.tgz"; + sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg=="; }; }; "wildcard-2.0.0" = { @@ -65005,159 +64996,6 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "workbox-background-sync-6.1.5" = { - name = "workbox-background-sync"; - packageName = "workbox-background-sync"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz"; - sha512 = "VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w=="; - }; - }; - "workbox-broadcast-update-6.1.5" = { - name = "workbox-broadcast-update"; - packageName = "workbox-broadcast-update"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz"; - sha512 = "zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA=="; - }; - }; - "workbox-build-6.1.5" = { - name = "workbox-build"; - packageName = "workbox-build"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.1.5.tgz"; - sha512 = "P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA=="; - }; - }; - "workbox-cacheable-response-6.1.5" = { - name = "workbox-cacheable-response"; - packageName = "workbox-cacheable-response"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz"; - sha512 = "x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA=="; - }; - }; - "workbox-core-6.1.5" = { - name = "workbox-core"; - packageName = "workbox-core"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.5.tgz"; - sha512 = "9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA=="; - }; - }; - "workbox-expiration-6.1.5" = { - name = "workbox-expiration"; - packageName = "workbox-expiration"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.1.5.tgz"; - sha512 = "6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ=="; - }; - }; - "workbox-google-analytics-6.1.5" = { - name = "workbox-google-analytics"; - packageName = "workbox-google-analytics"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz"; - sha512 = "LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA=="; - }; - }; - "workbox-navigation-preload-6.1.5" = { - name = "workbox-navigation-preload"; - packageName = "workbox-navigation-preload"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz"; - sha512 = "hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg=="; - }; - }; - "workbox-precaching-6.1.5" = { - name = "workbox-precaching"; - packageName = "workbox-precaching"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.1.5.tgz"; - sha512 = "yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw=="; - }; - }; - "workbox-range-requests-6.1.5" = { - name = "workbox-range-requests"; - packageName = "workbox-range-requests"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz"; - sha512 = "iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ=="; - }; - }; - "workbox-recipes-6.1.5" = { - name = "workbox-recipes"; - packageName = "workbox-recipes"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.1.5.tgz"; - sha512 = "MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q=="; - }; - }; - "workbox-routing-6.1.5" = { - name = "workbox-routing"; - packageName = "workbox-routing"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.1.5.tgz"; - sha512 = "uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ=="; - }; - }; - "workbox-strategies-6.1.5" = { - name = "workbox-strategies"; - packageName = "workbox-strategies"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.1.5.tgz"; - sha512 = "QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw=="; - }; - }; - "workbox-streams-6.1.5" = { - name = "workbox-streams"; - packageName = "workbox-streams"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.1.5.tgz"; - sha512 = "OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ=="; - }; - }; - "workbox-sw-6.1.5" = { - name = "workbox-sw"; - packageName = "workbox-sw"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.5.tgz"; - sha512 = "IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg=="; - }; - }; - "workbox-webpack-plugin-6.1.5" = { - name = "workbox-webpack-plugin"; - packageName = "workbox-webpack-plugin"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz"; - sha512 = "tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg=="; - }; - }; - "workbox-window-6.1.5" = { - name = "workbox-window"; - packageName = "workbox-window"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.5.tgz"; - sha512 = "akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA=="; - }; - }; "worker-farm-1.7.0" = { name = "worker-farm"; packageName = "worker-farm"; @@ -65212,15 +65050,6 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; - "wrap-ansi-4.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; - sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; - }; - }; "wrap-ansi-5.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -65464,6 +65293,15 @@ let sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; + "ws-8.0.0" = { + name = "ws"; + packageName = "ws"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.0.0.tgz"; + sha512 = "6AcSIXpBlS0QvCVKk+3cWnWElLsA6SzC0lkQ43ciEglgXJXiCWK3/CGFEJ+Ybgp006CMibamAsqOlxE9s4AvYA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -65545,13 +65383,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.52" = { + "xdl-59.0.53" = { name = "xdl"; packageName = "xdl"; - version = "59.0.52"; + version = "59.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.52.tgz"; - sha512 = "gKyfWDxd0lXut92LmOU4xte+AWt+sIJJTYILIwkbLtw0jqq556mg6+r5EDHI8kIHz1KFM3glTYTr1+W7uJ4wHw=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.53.tgz"; + sha512 = "U98lIdfMfwwUTmXwsF5t9Pu/VJSe+Bxb/1v0HWq6UK1VoA13EE2cE5JRBGFmu0+mkrust/Mp6AN289VKpguilw=="; }; }; "xenvar-0.5.1" = { @@ -66762,7 +66600,7 @@ in }) sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ @@ -66883,7 +66721,7 @@ in sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.7.3" @@ -67110,7 +66948,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."gulp-vinyl-zip-2.2.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -67347,7 +67185,7 @@ in sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" sources."form-data-4.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."html-encoding-sniffer-2.0.1" sources."http-proxy-agent-4.0.1" @@ -67451,7 +67289,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -67593,6 +67431,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hashlru-2.3.0" sources."he-1.2.0" sources."hmac-blake2b-2.0.0" @@ -67640,24 +67479,24 @@ in sources."inspect-custom-symbol-1.1.1" sources."internal-slot-1.0.3" sources."ipv4-peers-2.0.0" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-2.0.5" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-options-1.0.1" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -67983,7 +67822,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -68049,7 +67888,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -68090,7 +67929,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."human-signals-1.1.1" @@ -68442,7 +68281,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.4" - sources."@types/http-assert-1.5.1" + sources."@types/http-assert-1.5.2" sources."@types/http-errors-1.8.1" sources."@types/inquirer-6.5.0" (sources."@types/jscodeshift-0.7.2" // { @@ -68458,7 +68297,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -68729,7 +68568,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68812,7 +68651,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.156.0" + sources."flow-parser-0.157.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -68860,7 +68699,7 @@ in sources."into-stream-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-14.7.0" sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" @@ -68880,6 +68719,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -68920,13 +68760,13 @@ in sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -68940,16 +68780,16 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" @@ -69737,7 +69577,7 @@ in sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-3.2.0" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.7" @@ -69752,7 +69592,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -69772,7 +69612,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -69846,7 +69686,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69883,7 +69723,7 @@ in sources."browserslist-4.16.7" sources."caniuse-lite-1.0.30001249" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69910,14 +69750,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.961.0" // { + (sources."aws-sdk-2.963.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69991,7 +69831,7 @@ in sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" sources."http-errors-1.7.3" @@ -70067,7 +69907,7 @@ in sources."sax-1.2.1" sources."setprototypeof-1.1.1" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -70121,10 +69961,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.3"; + version = "10.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.3.tgz"; - sha512 = "z28OLydw1ShAWmnSJFdcES0krIoR1+SXxKarPo2fOPg5VzcNxttaSnWEO5BSsB1E64fJ4EImyMhhwKCZ9uB2xA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.6.tgz"; + sha512 = "dzYzWcLVcwbHwKfTp60ml7IYvWOmX6rD2rC/J9A2HT6VzefbcQ4/59YdzoPRhdlvmhblvj17jwExN0xQxOQJhQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -70137,7 +69977,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -70274,7 +70114,7 @@ in sources."camelcase-6.2.0" sources."caporal-1.4.0" sources."caseless-0.12.0" - sources."cbor-7.0.6" + sources."cbor-8.0.0" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { dependencies = [ @@ -70389,10 +70229,11 @@ in sources."cbor-7.0.5" sources."invoices-1.2.1" sources."ln-service-51.8.2" + sources."nofilter-2.0.3" ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -70489,6 +70330,7 @@ in sources."bn.js-5.2.0" sources."cbor-7.0.5" sources."invoices-1.2.1" + sources."nofilter-2.0.3" ]; }) (sources."ln-accounting-4.3.1" // { @@ -70501,21 +70343,24 @@ in sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" + sources."nofilter-2.0.3" sources."ws-7.5.0" ]; }) - (sources."ln-service-51.10.0" // { + (sources."ln-service-51.10.1" // { dependencies = [ sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.3.3" + sources."@types/node-16.4.3" sources."@types/request-2.48.6" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" + sources."cbor-7.0.6" sources."form-data-2.5.1" - sources."lightning-3.4.0" - sources."ws-7.5.3" + sources."lightning-3.5.0" + sources."nofilter-2.0.3" + sources."ws-8.0.0" ]; }) (sources."ln-sync-0.4.7" // { @@ -70527,8 +70372,10 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.7" sources."bn.js-5.2.0" + sources."cbor-7.0.6" sources."form-data-2.5.1" sources."lightning-3.4.0" + sources."nofilter-2.0.3" ]; }) (sources."ln-telegram-3.2.9" // { @@ -70540,7 +70387,7 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" - sources."cbor-7.0.5" + sources."cbor-7.0.6" sources."form-data-2.5.1" sources."lightning-3.3.16" sources."ln-service-51.9.0" @@ -70552,9 +70399,11 @@ in sources."@types/node-15.12.5" sources."@types/request-2.48.5" sources."@types/ws-7.4.5" + sources."cbor-7.0.5" sources."lightning-3.3.12" ]; }) + sources."nofilter-2.0.3" sources."ws-7.5.3" ]; }) @@ -70618,7 +70467,7 @@ in sources."node-addon-api-2.0.2" sources."node-fetch-2.6.1" sources."node-gyp-build-4.2.3" - sources."nofilter-2.0.3" + sources."nofilter-3.0.3" sources."normalize-url-4.5.1" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -70659,6 +70508,7 @@ in sources."cbor-7.0.5" sources."lightning-3.3.12" sources."ln-service-51.8.5" + sources."nofilter-2.0.3" sources."ws-7.5.0" ]; }) @@ -70680,7 +70530,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" ]; }) sources."proxy-addr-2.0.7" @@ -71219,7 +71069,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."fs.realpath-1.0.0" @@ -71240,17 +71090,17 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."lodash-4.2.1" @@ -71273,7 +71123,7 @@ in sources."path-parse-1.0.7" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" ]; }) sources."pify-2.3.0" @@ -71417,6 +71267,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -71432,20 +71283,20 @@ in sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" - sources."is-generator-function-1.0.9" + sources."is-date-object-1.0.5" + sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -71539,7 +71390,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -71585,7 +71436,7 @@ in sources."asn1-0.2.4" sources."assert-never-1.2.1" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -71744,6 +71595,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -71771,7 +71623,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-typedarray-1.0.0" sources."isarray-2.0.5" sources."isstream-0.1.2" @@ -72025,7 +71877,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -72148,7 +72000,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.7" sources."got-1.2.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -72455,7 +72307,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.114" + sources."constructs-3.3.117" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -72483,25 +72335,26 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -72529,13 +72382,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.316" // { + (sources."jsii-srcmak-0.1.319" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.286" + sources."json2jsii-0.1.289" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -72571,7 +72424,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.37" + sources."sscaff-1.2.40" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -72589,7 +72442,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" @@ -72723,9 +72576,9 @@ in sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" sources."@types/zen-observable-0.8.3" - sources."@wry/context-0.6.0" - sources."@wry/equality-0.5.1" - sources."@wry/trie-0.3.0" + sources."@wry/context-0.6.1" + sources."@wry/equality-0.5.2" + sources."@wry/trie-0.3.1" sources."accepts-1.3.7" sources."address-1.1.2" (sources."ansi-escapes-4.3.2" // { @@ -72765,7 +72618,7 @@ in sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."async-retry-1.3.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" @@ -72834,7 +72687,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.114" + sources."constructs-3.3.117" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -72934,7 +72787,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.3" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphology-0.20.0" sources."graphology-types-0.19.3" sources."graphql-15.5.1" @@ -72944,6 +72797,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hoist-non-react-statics-3.3.2" (sources."http-errors-1.7.2" // { dependencies = [ @@ -72973,13 +72827,13 @@ in sources."inquirer-8.1.2" sources."internal-slot-1.0.3" sources."ipaddr.js-1.9.1" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -72988,13 +72842,13 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-stream-2.0.1" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-unicode-supported-0.1.0" sources."is-valid-domain-0.1.2" sources."is-weakmap-2.0.1" @@ -73033,7 +72887,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.316" // { + (sources."jsii-srcmak-0.1.319" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -73191,7 +73045,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.37" + sources."sscaff-1.2.40" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -73251,7 +73105,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."widest-line-3.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -73894,10 +73748,11 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."ieee754-1.2.1" @@ -73906,16 +73761,16 @@ in sources."ini-1.3.8" sources."int64-buffer-0.1.10" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -74222,7 +74077,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -74372,7 +74227,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -75027,7 +74882,7 @@ in sha512 = "0CoePhEzGBHBin0mGtGhUV+hkg6Uh8+Qz0tN4a1A+vqiip/juRRmokB/yxMyFbhUftDXmkiF/JmrSC04uYCTAw=="; }; dependencies = [ - sources."pyright-1.1.159" + sources."pyright-1.1.160" ]; buildInputs = globalBuildInputs; meta = { @@ -75271,7 +75126,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76058,7 +75913,7 @@ in }; dependencies = [ sources."@dabh/diagnostics-2.0.2" - sources."async-3.2.0" + sources."async-3.2.1" sources."bintrees-1.0.1" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -76343,7 +76198,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -76627,7 +76482,7 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."spdx-correct-3.1.1" @@ -76738,7 +76593,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -76855,7 +76710,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -77109,7 +76964,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -77288,7 +77143,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."inflight-1.0.6" @@ -77643,10 +77498,12 @@ in sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -77704,7 +77561,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -78061,6 +77918,24 @@ in bypassCache = true; reconstructLock = true; }; + degit = nodeEnv.buildNodePackage { + name = "degit"; + packageName = "degit"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/degit/-/degit-2.8.4.tgz"; + sha512 = "vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Straightforward project scaffolding"; + homepage = "https://github.com/Rich-Harris/degit#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; @@ -78113,7 +77988,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -78220,10 +78095,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.72.0"; + version = "6.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.72.0.tgz"; - sha512 = "sOsFzBwwUkJkP6EZ8cOwz1eFva5sTf6ojhOgl2gplRs7+PkuqGyng/4TnKL3KIFqwE5lFsA66sIh8UQU4Dkecw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.73.0.tgz"; + sha512 = "9QWk+d0xuT6W+AEvr06Zoh1rllXGkDMUH9LxFtey3Abv5E0M2qSvdspGvqb4d6Fw7BZiThX4tDabT6VNpxqftQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -78427,7 +78302,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -78540,7 +78415,7 @@ in sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."electron-notarize-1.0.1" // { + (sources."electron-notarize-1.1.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -78652,7 +78527,7 @@ in sources."global-tunnel-ng-2.7.1" sources."globalthis-1.0.2" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -79080,7 +78955,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -79152,7 +79027,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -80046,7 +79921,7 @@ in sources."globby-10.0.2" sources."glogg-1.0.2" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-4.0.2" (sources."gulp-clean-css-4.3.0" // { dependencies = [ @@ -81433,10 +81308,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.9.1"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.9.1.tgz"; - sha512 = "73+efSO3vFiqQ/6jwfqPti/k2twvvS1u1v0iEoN0ylXpgFxTWO8DylTJZBqr0YdkpzljG7+yWZDrzdTspXLKww=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.10.0.tgz"; + sha512 = "NHQQBPygck2bQUo5nvCB52BHa+JsjxSlXvdQ39lvonJwvbOdn7IACxlqrkmaxvjfopCLBiBADj3yk1uSYh2cnQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -81473,14 +81348,12 @@ in sources."@babel/helper-module-transforms-7.15.0" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.15.0" sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" sources."@babel/helper-validator-identifier-7.14.9" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.14.5" sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ @@ -81488,62 +81361,35 @@ in ]; }) sources."@babel/parser-7.15.0" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-async-generator-functions-7.14.9" sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-class-static-block-7.14.5" - sources."@babel/plugin-proposal-dynamic-import-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" - sources."@babel/plugin-proposal-export-namespace-from-7.14.5" - sources."@babel/plugin-proposal-json-strings-7.14.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" - sources."@babel/plugin-proposal-numeric-separator-7.14.5" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-private-property-in-object-7.14.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" - sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-default-from-7.14.5" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-flow-7.14.5" - sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.14.5" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.14.5" sources."@babel/plugin-transform-arrow-functions-7.14.5" - sources."@babel/plugin-transform-async-to-generator-7.14.5" sources."@babel/plugin-transform-block-scoped-functions-7.14.5" sources."@babel/plugin-transform-block-scoping-7.14.5" sources."@babel/plugin-transform-classes-7.14.9" sources."@babel/plugin-transform-computed-properties-7.14.5" sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-dotall-regex-7.14.5" - sources."@babel/plugin-transform-duplicate-keys-7.14.5" sources."@babel/plugin-transform-exponentiation-operator-7.14.5" sources."@babel/plugin-transform-flow-strip-types-7.14.5" sources."@babel/plugin-transform-for-of-7.14.5" sources."@babel/plugin-transform-function-name-7.14.5" sources."@babel/plugin-transform-literals-7.14.5" sources."@babel/plugin-transform-member-expression-literals-7.14.5" - sources."@babel/plugin-transform-modules-amd-7.14.5" sources."@babel/plugin-transform-modules-commonjs-7.15.0" - sources."@babel/plugin-transform-modules-systemjs-7.14.5" - sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" - sources."@babel/plugin-transform-new-target-7.14.5" sources."@babel/plugin-transform-object-assign-7.14.5" sources."@babel/plugin-transform-object-super-7.14.5" sources."@babel/plugin-transform-parameters-7.14.5" @@ -81553,7 +81399,6 @@ in sources."@babel/plugin-transform-react-jsx-self-7.14.9" sources."@babel/plugin-transform-react-jsx-source-7.14.5" sources."@babel/plugin-transform-regenerator-7.14.5" - sources."@babel/plugin-transform-reserved-words-7.14.5" (sources."@babel/plugin-transform-runtime-7.15.0" // { dependencies = [ sources."semver-6.3.0" @@ -81563,21 +81408,9 @@ in sources."@babel/plugin-transform-spread-7.14.6" sources."@babel/plugin-transform-sticky-regex-7.14.5" sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-typescript-7.15.0" - sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.4" - (sources."@babel/runtime-7.14.8" // { - dependencies = [ - sources."regenerator-runtime-0.13.9" - ]; - }) + sources."@babel/runtime-7.9.0" (sources."@babel/template-7.14.5" // { dependencies = [ sources."@babel/code-frame-7.14.5" @@ -81591,14 +81424,14 @@ in sources."@babel/types-7.15.0" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.6" - (sources."@expo/config-plugins-3.0.6" // { + sources."@expo/config-5.0.7" + (sources."@expo/config-plugins-3.0.7" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.81" // { + (sources."@expo/dev-server-0.1.82" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -81615,7 +81448,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.112" + sources."@expo/dev-tools-0.13.113" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -81629,10 +81462,10 @@ in sources."tempy-0.3.0" ]; }) - sources."@expo/json-file-8.2.32" - sources."@expo/metro-config-0.1.81" + sources."@expo/json-file-8.2.33" + sources."@expo/metro-config-0.1.82" sources."@expo/osascript-2.0.30" - (sources."@expo/package-manager-0.0.45" // { + (sources."@expo/package-manager-0.0.46" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -81645,7 +81478,7 @@ in sources."xmldom-0.5.0" ]; }) - sources."@expo/prebuild-config-2.0.6" + sources."@expo/prebuild-config-2.0.7" sources."@expo/results-1.0.0" (sources."@expo/schemer-1.3.31" // { dependencies = [ @@ -81656,16 +81489,14 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.13.3" // { + (sources."@expo/webpack-config-0.14.0" // { dependencies = [ (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.9.0" sources."json5-2.2.0" - sources."regenerator-runtime-0.13.9" ]; }) (sources."@expo/xcpretty-3.1.4" // { @@ -81673,16 +81504,7 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@hapi/address-2.1.4" - sources."@hapi/formula-1.2.0" sources."@hapi/hoek-9.2.0" - (sources."@hapi/joi-16.1.8" // { - dependencies = [ - sources."@hapi/hoek-8.5.1" - sources."@hapi/topo-3.1.6" - ]; - }) - sources."@hapi/pinpoint-1.0.2" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" sources."@nodelib/fs.scandir-2.1.5" @@ -81726,20 +81548,14 @@ in sources."supports-color-7.2.0" ]; }) - sources."@rollup/plugin-babel-5.3.0" - sources."@rollup/plugin-node-resolve-11.2.1" - sources."@rollup/plugin-replace-2.4.2" - sources."@rollup/pluginutils-3.1.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.0.1" - sources."@surma/rollup-plugin-off-main-thread-1.4.2" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" - sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" sources."@types/html-minifier-terser-5.1.2" sources."@types/http-cache-semantics-4.0.1" @@ -81751,7 +81567,6 @@ in sources."@types/minimatch-3.0.5" sources."@types/node-9.6.61" sources."@types/q-1.5.5" - sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" sources."@types/source-list-map-0.1.2" @@ -81766,7 +81581,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-2.1.1" // { + (sources."@types/webpack-sources-3.2.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -81884,7 +81699,6 @@ in sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-preset-fbjs-3.4.0" - sources."babel-runtime-6.26.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -81941,7 +81755,6 @@ in sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" - sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -82048,7 +81861,6 @@ in sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" - sources."common-tags-1.8.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."component-type-1.2.1" @@ -82100,7 +81912,6 @@ in sources."semver-6.3.0" ]; }) - sources."core-js-2.6.12" (sources."core-js-compat-3.16.0" // { dependencies = [ sources."browserslist-4.16.7" @@ -82234,8 +82045,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -82277,8 +82087,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-1.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-2.0.3" sources."events-3.3.0" @@ -82311,7 +82119,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.91" // { + (sources."expo-pwa-0.0.92" // { dependencies = [ sources."commander-2.20.0" ]; @@ -82409,7 +82217,6 @@ in sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" @@ -82422,7 +82229,7 @@ in sources."globals-11.12.0" sources."globby-11.0.1" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-0.13.2" (sources."graphql-tools-3.0.0" // { dependencies = [ @@ -82437,6 +82244,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -82535,17 +82343,17 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-docker-2.2.1" @@ -82560,10 +82368,9 @@ in ]; }) sources."is-lambda-1.0.1" - sources."is-module-1.0.0" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { @@ -82597,13 +82404,12 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.3" - sources."is-regexp-1.0.0" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" sources."is-stream-2.0.1" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" @@ -82675,7 +82481,6 @@ in sources."lodash.isobject-3.0.2" sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" - sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" (sources."log-symbols-2.2.0" // { dependencies = [ @@ -82691,7 +82496,6 @@ in }) sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."magic-string-0.25.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -83232,7 +83036,7 @@ in sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.11.1" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -83295,19 +83099,6 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.56.0" - (sources."rollup-plugin-terser-7.0.2" // { - dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.7.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."terser-5.7.1" - ]; - }) sources."router-ips-1.0.0" sources."run-parallel-1.2.0" sources."run-queue-1.0.3" @@ -83362,7 +83153,7 @@ in sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -83411,7 +83202,6 @@ in sources."source-map-resolve-0.5.3" sources."source-map-support-0.4.18" sources."source-map-url-0.4.1" - sources."sourcemap-codec-1.4.8" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -83468,13 +83258,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - (sources."stringify-object-3.3.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) sources."strip-ansi-6.0.0" - sources."strip-comments-2.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."style-loader-1.2.1" @@ -83575,7 +83359,6 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" sources."traverse-0.6.6" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" @@ -83677,7 +83460,6 @@ in }) sources."wbuf-1.7.3" sources."wcwidth-1.0.1" - sources."webidl-conversions-4.0.2" (sources."webpack-4.43.0" // { dependencies = [ sources."braces-2.3.2" @@ -83805,7 +83587,6 @@ in }) sources."websocket-driver-0.6.5" sources."websocket-extensions-0.1.4" - sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" @@ -83818,34 +83599,6 @@ in }) sources."widest-line-3.1.0" sources."with-open-file-0.1.7" - sources."workbox-background-sync-6.1.5" - sources."workbox-broadcast-update-6.1.5" - (sources."workbox-build-6.1.5" // { - dependencies = [ - sources."crypto-random-string-2.0.0" - sources."fs-extra-9.1.0" - sources."source-map-0.8.0-beta.0" - sources."temp-dir-2.0.0" - sources."tempy-0.6.0" - sources."type-fest-0.16.0" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - ]; - }) - sources."workbox-cacheable-response-6.1.5" - sources."workbox-core-6.1.5" - sources."workbox-expiration-6.1.5" - sources."workbox-google-analytics-6.1.5" - sources."workbox-navigation-preload-6.1.5" - sources."workbox-precaching-6.1.5" - sources."workbox-range-requests-6.1.5" - sources."workbox-recipes-6.1.5" - sources."workbox-routing-6.1.5" - sources."workbox-strategies-6.1.5" - sources."workbox-streams-6.1.5" - sources."workbox-sw-6.1.5" - sources."workbox-webpack-plugin-6.1.5" - sources."workbox-window-6.1.5" sources."worker-farm-1.7.0" sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { @@ -83863,7 +83616,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.52" // { + (sources."xdl-59.0.53" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -83871,7 +83624,6 @@ in sources."minizlib-1.3.3" sources."p-map-3.0.0" sources."tar-4.4.6" - sources."uuid-3.3.2" sources."yallist-3.1.1" ]; }) @@ -83957,7 +83709,7 @@ in sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -84009,7 +83761,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -84227,18 +83979,7 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.2" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-4.1.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."supports-color-7.2.0" - sources."wrap-ansi-4.0.0" + sources."@oclif/plugin-help-3.3.0" ]; }) (sources."@oclif/config-1.17.0" // { @@ -84247,6 +83988,24 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.28" // { + dependencies = [ + sources."chalk-4.1.2" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."supports-color-8.1.1" + ]; + }) + sources."fs-extra-9.1.0" + sources."globby-11.0.4" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" + sources."supports-color-7.2.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.5" @@ -84280,10 +84039,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."ansi-escapes-3.2.0" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" + sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -84295,6 +84055,7 @@ in sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -84313,6 +84074,7 @@ in sources."chalk-4.1.2" sources."has-flag-4.0.0" sources."supports-color-7.2.0" + sources."type-fest-0.20.2" ]; }) sources."brace-expansion-1.1.11" @@ -84355,19 +84117,28 @@ in }) sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" - sources."cli-table-0.3.6" + sources."cli-progress-3.9.0" + (sources."cli-table-0.3.6" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) (sources."cli-ux-4.9.3" // { dependencies = [ + sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."clean-stack-2.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."extract-stack-1.0.0" sources."fs-extra-7.0.1" + sources."has-flag-2.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" sources."semver-5.7.1" sources."strip-ansi-5.2.0" + sources."supports-hyperlinks-1.0.1" ]; }) sources."clone-response-1.0.2" @@ -84375,7 +84146,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.0.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -84445,7 +84216,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."extract-stack-1.0.0" + sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" @@ -84470,6 +84241,7 @@ in sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-package-type-0.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -84508,7 +84280,7 @@ in ]; }) sources."got-8.3.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -84528,6 +84300,7 @@ in }) (sources."heroku-cli-util-8.0.12" // { dependencies = [ + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" @@ -84570,6 +84343,7 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" @@ -84603,6 +84377,7 @@ in sources."moment-2.29.1" sources."ms-2.1.2" sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" (sources."netrc-parser-3.1.6" // { dependencies = [ sources."debug-3.2.7" @@ -84627,6 +84402,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-treeify-1.1.33" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -84637,7 +84413,11 @@ in sources."p-is-promise-1.1.0" sources."p-timeout-2.0.1" sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -84723,6 +84503,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -84752,9 +84533,10 @@ in sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."supports-color-5.5.0" - (sources."supports-hyperlinks-1.0.1" // { + (sources."supports-hyperlinks-2.2.0" // { dependencies = [ - sources."has-flag-2.0.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."timed-out-4.0.1" @@ -84772,7 +84554,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.20.2" + sources."type-fest-0.21.3" sources."union-value-1.0.1" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -84863,7 +84645,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -84909,7 +84691,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."ast-types-0.13.4" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -85212,14 +84994,14 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.21.1" // { + (sources."google-gax-2.22.1" // { dependencies = [ sources."google-auth-library-7.5.0" ]; }) sources."google-p12-pem-3.1.1" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -85479,6 +85261,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" + sources."proto3-json-serializer-0.1.1" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-4.0.1" // { @@ -85556,7 +85339,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."simple-swizzle-0.2.2" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -85969,7 +85752,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -86035,7 +85818,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."global-4.4.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" @@ -86142,7 +85925,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.5.0" + sources."web3-utils-1.5.1" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -86330,10 +86113,11 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -86347,14 +86131,14 @@ in sources."ini-1.3.8" sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -86366,14 +86150,14 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-1.0.1" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -86577,7 +86361,7 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."winston-0.8.3" // { dependencies = [ sources."async-0.2.10" @@ -86751,7 +86535,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -86914,7 +86698,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -87003,7 +86787,7 @@ in sources."global-dirs-3.0.0" sources."globals-11.12.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-15.5.1" sources."graphql-compose-7.25.1" sources."graphql-subscriptions-1.2.1" @@ -87591,7 +87375,7 @@ in sources."semver-5.7.1" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { @@ -87743,7 +87527,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-10.0.1" + sources."conf-10.0.2" (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" @@ -87804,7 +87588,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -87972,7 +87756,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -88141,7 +87925,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -88283,7 +88067,7 @@ in sources."p-cancelable-1.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphql-15.3.0" (sources."graphql-config-3.0.3" // { dependencies = [ @@ -88299,6 +88083,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."http2-client-1.3.5" @@ -88326,12 +88111,12 @@ in ]; }) sources."internal-slot-1.0.3" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -88340,14 +88125,14 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-promise-4.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" @@ -88573,7 +88358,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -89102,7 +88887,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" @@ -89503,7 +89288,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulplog-1.0.0" sources."has-1.0.3" sources."has-symbols-1.0.2" @@ -89893,10 +89678,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.12.3"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz"; - sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA=="; + url = "https://registry.npmjs.org/http-server/-/http-server-13.0.0.tgz"; + sha512 = "tqOx2M1CiZ3aVaE7Ue/0lup9kOG+Zqg6wdT1HygvxFnvPpU9doBMPcQ1ffT0/QS3J9ua35gipg0o3Dr8N0K0Tg=="; }; dependencies = [ sources."async-2.6.3" @@ -89905,7 +89690,6 @@ in sources."colors-1.4.0" sources."corser-2.0.1" sources."debug-3.2.7" - sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" sources."follow-redirects-1.14.1" sources."function-bind-1.1.1" @@ -90206,7 +89990,7 @@ in sources."object-assign-3.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-ansi-2.0.0" @@ -90462,7 +90246,7 @@ in sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."historic-readline-1.0.8" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" @@ -90616,7 +90400,7 @@ in sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" @@ -90742,7 +90526,7 @@ in sources."is-fullwidth-code-point-3.0.0" ]; }) - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -90933,7 +90717,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.3" @@ -91255,6 +91039,15 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.28" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."strip-ansi-6.0.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) (sources."@oclif/errors-1.3.5" // { dependencies = [ sources."fs-extra-8.1.0" @@ -91271,22 +91064,8 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-6.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."@oclif/plugin-help-3.3.0" + sources."@oclif/screen-1.0.4" sources."@percy/config-1.0.0-beta.63" sources."@percy/logger-1.0.0-beta.63" sources."@percy/migrate-0.10.0" @@ -91309,6 +91088,7 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" sources."anymatch-3.1.2" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.5" // { @@ -91342,8 +91122,9 @@ in }) sources."async-mutex-0.1.4" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.961.0" // { + (sources."aws-sdk-2.963.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -91383,6 +91164,7 @@ in sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caniuse-lite-1.0.30001249" + sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -91419,7 +91201,17 @@ in }) sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" sources."cli-spinners-2.6.0" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."has-flag-4.0.0" + sources."strip-ansi-6.0.0" + sources."supports-color-8.1.1" + sources."tslib-2.3.0" + ]; + }) sources."cli-width-3.0.0" sources."cliss-0.0.2" sources."clone-1.0.4" @@ -91455,7 +91247,14 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-7.0.0" sources."cross-env-6.0.3" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ @@ -91540,7 +91339,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -91607,6 +91406,7 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."extract-stack-2.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" @@ -91624,7 +91424,7 @@ in sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" - sources."flow-parser-0.156.0" + sources."flow-parser-0.157.0" sources."follow-redirects-1.14.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" @@ -91651,6 +91451,7 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."get-value-2.0.6" @@ -91660,7 +91461,7 @@ in sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -91701,6 +91502,7 @@ in }) sources."http-errors-1.8.0" sources."http-signature-1.2.0" + sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" @@ -91797,6 +91599,7 @@ in sources."jmespath-0.15.0" sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" (sources."jscodeshift-0.11.0" // { dependencies = [ @@ -91897,7 +91700,7 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."mermaid-8.11.3" + sources."mermaid-8.11.4" sources."micromatch-4.0.4" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -91927,6 +91730,7 @@ in sources."nanoid-3.1.23" sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" + sources."natural-orderby-2.0.3" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" (sources."needle-2.8.0" // { @@ -91936,6 +91740,7 @@ in }) sources."neo-async-2.6.2" sources."nextgen-events-1.5.2" + sources."nice-try-1.0.5" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { dependencies = [ @@ -91952,13 +91757,13 @@ in sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.2" - sources."which-1.3.1" ]; }) sources."node-modules-regexp-1.0.0" (sources."node-notifier-8.0.2" // { dependencies = [ sources."uuid-8.3.2" + sources."which-2.0.2" ]; }) sources."node-persist-2.1.0" @@ -91999,6 +91804,7 @@ in sources."magicli-0.0.5" ]; }) + sources."object-treeify-1.1.33" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.pick-1.3.0" @@ -92023,9 +91829,16 @@ in sources."parse-json-5.2.0" sources."parse5-5.1.0" sources."pascalcase-0.1.1" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cross-spawn-6.0.5" + sources."semver-5.7.1" + ]; + }) sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" + sources."path-key-2.0.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -92066,6 +91879,7 @@ in sources."tslib-2.3.0" ]; }) + sources."redeyed-2.1.1" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" sources."regex-not-1.0.2" @@ -92134,8 +91948,8 @@ in sources."simple-get-4.0.0" ]; }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shellwords-0.1.1" sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" @@ -92243,6 +92057,12 @@ in sources."strip-json-comments-2.0.1" sources."stylis-4.0.10" 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."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" @@ -92341,7 +92161,7 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" - sources."which-2.0.2" + sources."which-1.3.1" (sources."wide-align-1.1.3" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -92456,7 +92276,7 @@ in sources."catharsis-0.9.0" sources."entities-2.0.3" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -92729,7 +92549,7 @@ in sources."get-stream-4.1.0" sources."global-dirs-3.0.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -93065,7 +92885,7 @@ in sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."got-5.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -93491,6 +93311,14 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.28" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.5" // { @@ -93502,21 +93330,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" (sources."@putdotio/api-client-8.17.0" // { dependencies = [ @@ -93531,6 +93345,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" (sources."axios-0.19.2" // { dependencies = [ sources."debug-3.1.0" @@ -93611,9 +93426,10 @@ in sources."fs-extra-8.1.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -93763,7 +93579,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -93818,7 +93634,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."http-errors-1.7.2" sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" @@ -94024,10 +93840,11 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -94044,23 +93861,23 @@ in sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.1" sources."internal-slot-1.0.3" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.9" + sources."is-generator-function-1.0.10" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-2.0.1" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -94167,7 +93984,7 @@ in sources."valid-url-1.0.9" sources."vm-browserify-1.1.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.4" @@ -94219,7 +94036,7 @@ in sources."glob-7.1.7" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-symbols-1.0.2" sources."inflight-1.0.6" @@ -95131,7 +94948,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -95140,6 +94957,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" @@ -95178,26 +94996,26 @@ in sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-lambda-1.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-ssh-1.3.3" sources."is-stream-2.0.1" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" @@ -95431,7 +95249,7 @@ in sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slide-1.1.6" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."sort-keys-2.0.0" @@ -95566,7 +95384,7 @@ in sources."copy-anything-2.0.3" sources."debug-3.2.7" sources."errno-0.1.8" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."iconv-lite-0.4.24" sources."image-size-0.5.5" sources."is-what-3.14.1" @@ -95741,7 +95559,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -96089,7 +95907,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -96578,7 +96396,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -96635,7 +96453,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."async-each-1.0.3" sources."async-retry-1.3.1" sources."asynckit-0.4.0" @@ -96875,7 +96693,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96995,7 +96813,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -97691,7 +97509,7 @@ in sources."ansi-styles-4.3.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -97888,7 +97706,7 @@ in sources."glob-7.1.7" sources."globals-9.18.0" sources."glogg-1.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gulp-eslint-3.0.1" (sources."gulp-util-3.0.8" // { dependencies = [ @@ -98190,6 +98008,14 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.28" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + ]; + }) sources."@oclif/errors-1.3.5" sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.5" // { @@ -98203,25 +98029,12 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."@oclif/plugin-help-3.3.0" + sources."@oclif/screen-1.0.4" sources."@percy/config-1.0.0-beta.63" sources."@percy/logger-1.0.0-beta.63" sources."@percy/migrate-0.10.0" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -98229,6 +98042,8 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -98240,6 +98055,7 @@ in sources."tslib-2.3.0" ]; }) + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" @@ -98261,6 +98077,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."caniuse-lite-1.0.30001249" + sources."cardinal-2.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-1.1.4" @@ -98283,7 +98100,14 @@ in }) sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" + sources."cli-progress-3.9.0" sources."cli-spinners-2.6.0" + (sources."cli-ux-5.6.3" // { + dependencies = [ + sources."supports-color-8.1.1" + sources."tslib-2.3.0" + ]; + }) sources."cli-width-3.0.0" sources."clone-1.0.4" sources."clone-deep-4.0.1" @@ -98303,7 +98127,14 @@ in }) sources."copy-descriptor-0.1.1" sources."cosmiconfig-7.0.0" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."d3-5.16.0" sources."d3-array-1.2.4" sources."d3-axis-1.0.12" @@ -98350,7 +98181,7 @@ in sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -98389,6 +98220,7 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."extract-stack-2.0.0" sources."extract-zip-2.0.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" @@ -98410,7 +98242,7 @@ in ]; }) sources."find-up-4.1.0" - sources."flow-parser-0.156.0" + sources."flow-parser-0.157.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" @@ -98419,13 +98251,14 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -98442,6 +98275,7 @@ in ]; }) sources."https-proxy-agent-5.0.0" + sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.1.8" @@ -98476,6 +98310,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" (sources."jscodeshift-0.11.0" // { dependencies = [ (sources."braces-2.3.2" // { @@ -98517,7 +98352,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."merge2-1.4.1" - sources."mermaid-8.11.3" + sources."mermaid-8.11.4" sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -98532,7 +98367,9 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" sources."neo-async-2.6.2" + sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-modules-regexp-1.0.0" @@ -98551,6 +98388,7 @@ in ]; }) sources."object-keys-1.1.1" + sources."object-treeify-1.1.33" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.pick-1.3.0" @@ -98564,9 +98402,16 @@ in sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."pascalcase-0.1.1" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."cross-spawn-6.0.5" + sources."semver-5.7.1" + ]; + }) sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" + sources."path-key-2.0.1" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.0" @@ -98587,6 +98432,7 @@ in sources."tslib-2.3.0" ]; }) + sources."redeyed-2.1.1" sources."regex-not-1.0.2" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" @@ -98615,8 +98461,8 @@ in ]; }) sources."shallow-clone-3.0.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -98658,6 +98504,7 @@ in }) sources."source-map-url-0.4.1" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -98680,6 +98527,7 @@ in sources."strip-ansi-6.0.0" sources."stylis-4.0.10" sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.2.0" sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" (sources."temp-0.8.4" // { @@ -98717,7 +98565,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" - sources."which-2.0.2" + sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -99380,10 +99228,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.0.5"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.5.tgz"; - sha512 = "u6nQQSwJwKM3llCxjseF71yl3ecEN2apAZVvOkx+rha0wuqBz5SNi70TVbgbLaBMxjhJnfRsbgXEizRBub9fHQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.8.tgz"; + sha512 = "pYqdFgEw/2pWjSZQ4r+UEmXy1UkR4WDSf8INBJOEJvIzw4HaBD/pjsUadwkGvMX/iUjSy2/dD9SLZbESFA8lTA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -99517,7 +99365,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-17.9.0" // { + (sources."@netlify/build-17.9.2" // { dependencies = [ sources."ansi-styles-4.3.0" (sources."boxen-4.2.0" // { @@ -99546,7 +99394,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-14.4.1" // { + (sources."@netlify/config-14.4.3" // { dependencies = [ sources."dot-prop-5.3.0" sources."execa-3.4.0" @@ -99660,6 +99508,31 @@ in sources."tslib-2.3.0" ]; }) + (sources."@oclif/core-0.5.28" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.5" + sources."ansi-styles-4.3.0" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."clean-stack-3.0.1" + sources."dir-glob-3.0.1" + sources."escape-string-regexp-4.0.0" + sources."fast-glob-3.2.7" + sources."fill-range-7.0.1" + sources."fs-extra-9.1.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."jsonfile-6.1.0" + sources."micromatch-4.0.4" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.3.0" + sources."universalify-2.0.0" + sources."wrap-ansi-7.0.0" + ]; + }) (sources."@oclif/errors-1.3.5" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99678,21 +99551,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-help-3.2.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) + sources."@oclif/plugin-help-3.3.0" (sources."@oclif/plugin-not-found-1.2.4" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -99774,7 +99633,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -99858,7 +99717,7 @@ in sources."ascii-table-0.0.9" sources."assign-symbols-1.0.0" sources."ast-module-types-2.7.1" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" @@ -100198,7 +100057,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -100365,6 +100224,7 @@ in sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-package-type-0.1.0" sources."get-port-5.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" @@ -100404,7 +100264,7 @@ in sources."to-readable-stream-1.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -100750,7 +100610,7 @@ in sources."qs-6.10.1" ]; }) - (sources."netlify-redirect-parser-8.1.0" // { + (sources."netlify-redirect-parser-8.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -101419,7 +101279,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" @@ -101466,7 +101326,7 @@ in sources."semver-7.3.5" sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."ssri-8.0.1" @@ -101603,7 +101463,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.3" @@ -101927,7 +101787,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -102082,7 +101942,7 @@ in sources."get-stream-5.2.0" sources."glob-7.1.7" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" (sources."help-me-3.0.0" // { @@ -102357,7 +102217,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -102550,7 +102410,7 @@ in sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -102687,7 +102547,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -102805,7 +102665,7 @@ in sources."type-fest-0.10.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -103191,10 +103051,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.20.3"; + version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.20.3.tgz"; - sha512 = "Kxk+NSnv+bcUKlWEKRaJ745AjEApYzM6GHxXs9AzR8VJiRMPcKvrIGMp+pdkIaF++2kEbcyg/Kx0FCrv+ySJiQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.5.tgz"; + sha512 = "vRyu1V79n5BzKn4vkanag1xEjEMLIZ48Ry1V7IyAvHQHi8syOEiYWvUMxNpeDk+e8JKAKCNG3lIYJDm3pM8VMQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -103339,7 +103199,7 @@ in }) sources."globby-11.0.4" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-4.0.0" @@ -103501,7 +103361,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."spawn-please-1.0.0" @@ -104135,7 +103995,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.21" + sources."deasync-0.1.22" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" @@ -104190,7 +104050,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -104261,7 +104121,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -104274,6 +104134,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -104326,11 +104187,11 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { @@ -104338,7 +104199,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -104351,12 +104212,12 @@ in sources."is-html-1.1.0" sources."is-negative-zero-2.0.1" sources."is-number-3.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" @@ -104927,12 +104788,13 @@ in sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" sources."hot-shots-6.8.7" @@ -104942,7 +104804,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -105078,7 +104940,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wikimedia-langconv-0.1.0" - sources."wikipeg-2.0.5" + sources."wikipeg-2.0.6" sources."wordwrap-1.0.0" sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" @@ -105128,7 +104990,7 @@ in sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -105272,11 +105134,12 @@ in sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" sources."http-headers-3.0.2" @@ -105302,13 +105165,13 @@ in sources."ip-1.1.5" sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -105614,7 +105477,7 @@ in sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-binary2-1.0.3" // { @@ -105925,7 +105788,7 @@ in sources."github-from-package-0.0.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" @@ -106089,7 +105952,7 @@ in sources."anymatch-3.1.2" sources."argparse-1.0.10" sources."ast-types-0.13.4" - sources."async-3.2.0" + sources."async-3.2.1" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.1" @@ -106148,7 +106011,7 @@ in sources."git-sha1-0.1.2" sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."http-errors-1.7.3" @@ -106229,7 +106092,7 @@ in sources."setprototypeof-1.1.1" sources."shimmer-1.2.1" sources."signal-exit-3.0.3" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" @@ -106273,10 +106136,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.11.5"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.11.5.tgz"; - sha512 = "TXMSRyncP88F4GTdKFIIi3kdXSYf+v3uvIKLfNjPTt2YjsrbKmYNCR3VsGjYwlMVSnH2UEo2/sM2VNSefH9Isw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.12.0.tgz"; + sha512 = "3kBjfvJo6eFu6tKpXFhit/Mihd364cjaG4bblu4px8kVbSX+oGKmPBGver4zLG2dP0txtglNU+AS0e1OGEJQMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -106300,7 +106163,7 @@ in sources."commander-2.11.0" sources."file-or-stdin-1.0.2" sources."get-stdin-5.0.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."inspect-with-kind-1.0.5" sources."kind-of-6.0.3" sources."poor-mans-t-sql-formatter-1.6.10" @@ -106377,7 +106240,7 @@ in sources."get-stdin-8.0.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" @@ -106619,7 +106482,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.7" sources."globule-1.3.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ @@ -106779,10 +106642,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.2.tgz"; - sha512 = "dlxcc6Fv7rcXO3uFVcOgZturcKknB4J00ITJjZCrORTjw5eVbGcSTKrSeSAlNZWaUYu0HQX9NHVKtHDG/6rBNw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.3.tgz"; + sha512 = "qAlUEFQRTRKnKet3SxRbLmrC5mOyBIiR5CDqzOmorDN10jgcFIR6mL1sJujQc5cRRcE+HNbBuBeoVdiDvznOGg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -106881,7 +106744,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-symbols-1.0.2" sources."http-cache-semantics-4.1.0" @@ -106922,7 +106785,7 @@ in sources."semver-6.3.0" sources."side-channel-1.0.4" sources."sisteransi-1.0.5" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."strip-json-comments-2.0.1" @@ -106945,10 +106808,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.159"; + version = "1.1.160"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.159.tgz"; - sha512 = "KCKxW9MWLTTmM6CMHixpgX0H+eZO40aAQwXs1qji4Ru+Yq/KJCGb2b7eTqXMoRxEqz1cIinvpaoH11R54gUBGQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.160.tgz"; + sha512 = "SBgUVitoBS+VvGEG1IoPJNgJ9PSjsjCqeJPZ7DWMz9s4SvYHeZz57VtWlGGGpgjT19nmH/zPe8Cxk4CLXmDhiA=="; }; buildInputs = globalBuildInputs; meta = { @@ -107221,23 +107084,24 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internal-slot-1.0.3" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" @@ -107270,7 +107134,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -107432,7 +107296,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -107849,7 +107713,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -108017,7 +107881,7 @@ in sources."pify-3.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gud-1.0.0" sources."gunzip-maybe-1.4.2" sources."gzip-size-5.1.1" @@ -108034,6 +107898,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.2" sources."has-to-string-tag-x-1.4.1" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -108139,17 +108004,17 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.2" + sources."is-bigint-1.0.3" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -108161,7 +108026,7 @@ in sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-object-1.0.2" sources."is-path-cwd-2.2.0" @@ -108169,11 +108034,11 @@ in sources."is-path-inside-2.1.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -109065,7 +108930,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -109567,7 +109432,7 @@ in sources."figures-3.2.0" sources."find-up-2.1.0" sources."function-bind-1.1.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.9" @@ -109779,7 +109644,7 @@ in sources."@types/node-14.17.9" sources."@types/node-fetch-2.5.12" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.58.1" + sources."@types/vscode-1.59.0" sources."@typescript-eslint/eslint-plugin-4.29.0" sources."@typescript-eslint/experimental-utils-4.29.0" sources."@typescript-eslint/parser-4.29.0" @@ -109928,7 +109793,7 @@ in sources."glob-parent-5.1.2" sources."globals-13.10.0" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -110050,7 +109915,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.56.0" + sources."rollup-2.51.1" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -110428,10 +110293,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.53.0"; + version = "2.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.53.0.tgz"; - sha512 = "2srJa55dQY4kx+aNGkevvZbJ/8j/C1TLD3AvZdpqgrRPNG41yfl1B3V/pXMmq5sfdpx09Fr8JOeNRgUgJUq7Aw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.53.1.tgz"; + sha512 = "LK7BWPCpMq0p1TcnJb4uCkxYYrbsM2J7FOCd29BYKmvvUrB+NzFeAVGE1sR/cPF6ECT0PWsR9NEADb24o5D2WA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -110523,7 +110388,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -110557,7 +110422,7 @@ in }) (sources."archiver-5.3.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" sources."bl-4.1.0" sources."tar-stream-2.2.0" ]; @@ -110584,7 +110449,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.961.0" // { + (sources."aws-sdk-2.963.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -110866,7 +110731,7 @@ in sources."responselike-2.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -110942,7 +110807,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.7.0" // { + (sources."jszip-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -111635,7 +111500,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -112101,7 +111966,7 @@ in sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."async-3.2.0" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" @@ -112240,7 +112105,7 @@ in sources."globalthis-1.0.2" sources."globby-11.0.4" sources."got-11.8.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" sources."gunzip-maybe-1.4.2" sources."has-1.0.3" @@ -112261,7 +112126,7 @@ in sources."inherits-2.0.4" sources."ini-2.0.0" sources."is-3.3.0" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-ci-2.0.0" sources."is-deflate-1.0.0" sources."is-docker-2.2.1" @@ -112287,7 +112152,7 @@ in sources."json-buffer-3.0.1" sources."json-file-plus-3.3.1" sources."json-stringify-safe-5.0.1" - (sources."jszip-3.7.0" // { + (sources."jszip-3.7.1" // { dependencies = [ sources."pako-1.0.11" sources."readable-stream-2.3.7" @@ -112530,7 +112395,15 @@ in sources."p-map-2.1.0" ]; }) - sources."snyk-nuget-plugin-1.22.0" + (sources."snyk-nuget-plugin-1.22.0" // { + dependencies = [ + sources."jszip-3.7.0" + sources."pako-1.0.11" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."snyk-paket-parser-1.6.0" (sources."snyk-php-plugin-1.9.2" // { dependencies = [ @@ -112695,7 +112568,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -112780,7 +112653,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.9" @@ -113139,12 +113012,13 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -113182,12 +113056,12 @@ in }) sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.0" - sources."is-bigint-1.0.2" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.3" sources."is-binary-path-1.0.1" - sources."is-boolean-object-1.1.1" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-canonical-base64-1.1.1" sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { @@ -113195,7 +113069,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" (sources."is-descriptor-1.0.2" // { dependencies = [ @@ -113212,7 +113086,7 @@ in sources."is-map-2.0.2" sources."is-negative-zero-2.0.1" sources."is-number-2.1.0" - sources."is-number-object-1.0.5" + sources."is-number-object-1.0.6" sources."is-options-1.0.1" (sources."is-plain-object-2.0.4" // { dependencies = [ @@ -113221,11 +113095,11 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-set-2.0.2" - sources."is-string-1.0.6" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.5" + sources."is-typed-array-1.1.7" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" @@ -113585,7 +113459,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."side-channel-1.0.4" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -113792,7 +113666,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.4" + sources."which-typed-array-1.1.6" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -113896,7 +113770,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.961.0" // { + (sources."aws-sdk-2.963.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -114105,7 +113979,7 @@ in sources."debug-3.2.7" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -114118,6 +113992,7 @@ in }) sources."has-cors-1.1.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" (sources."hipchatter-0.3.2" // { @@ -114160,7 +114035,7 @@ in sources."is-my-json-valid-2.20.5" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -114772,7 +114647,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -115014,7 +114889,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -115096,7 +114971,7 @@ in sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; }; dependencies = [ - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -115405,7 +115280,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.21" @@ -116066,7 +115941,7 @@ in sources."errno-0.1.8" sources."fs.realpath-1.0.0" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -116199,26 +116074,27 @@ in sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-core-module-2.5.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-utf8-0.2.1" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" @@ -116548,7 +116424,7 @@ in ]; }) sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -117055,15 +116931,16 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.4" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."object-inspect-1.11.0" sources."object-keys-1.1.1" @@ -117163,16 +117040,17 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" - sources."is-bigint-1.0.2" - sources."is-boolean-object-1.1.1" - sources."is-callable-1.2.3" + sources."is-bigint-1.0.3" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" sources."is-capitalized-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-negative-zero-2.0.1" - sources."is-number-object-1.0.5" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" + sources."is-number-object-1.0.6" + sources."is-regex-1.1.4" + sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."object-inspect-1.11.0" sources."object-keys-1.1.1" @@ -117244,7 +117122,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -117397,7 +117275,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.7" sources."got-11.5.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -117728,7 +117606,7 @@ in sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-3.2.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -117763,7 +117641,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-signature-1.2.0" @@ -118157,7 +118035,7 @@ in sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."globby-11.0.4" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."ignore-5.1.8" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -118270,7 +118148,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."async-3.2.0" + sources."async-3.2.1" sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -118540,7 +118418,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -118910,20 +118788,20 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "23.0.1"; + version = "23.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-23.0.1.tgz"; - sha512 = "gY9D74WG9OL7TB/z1g4fypxq3eSiWtFMFx1gIbNf0DXIHGxWG+eczhGxa3IiZ14HhrebTfiPnM8O26AL81MVrQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-23.1.1.tgz"; + sha512 = "9HScSWBFGHmFvvInD0IgbkIrP1+rPjajDlI0n/7HTPOgZ68l2DShEpN6Igt2BPFQhbMK8Fwt5MNuC5RM6JTI2Q=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.12" - sources."@vercel/build-utils-2.11.1" - sources."@vercel/go-1.2.2" - sources."@vercel/node-1.11.1" - sources."@vercel/python-2.0.4" - sources."@vercel/ruby-1.2.6" + sources."@types/node-16.4.13" + sources."@vercel/build-utils-2.12.1" + sources."@vercel/go-1.2.3" + sources."@vercel/node-1.12.0" + sources."@vercel/python-2.0.5" + sources."@vercel/ruby-1.2.7" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -118961,7 +118839,7 @@ in sources."get-stream-4.1.0" sources."global-dirs-2.1.0" sources."got-9.6.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -119016,7 +118894,7 @@ in sources."ts-node-8.9.1" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.3" + sources."typescript-4.3.4" sources."unique-string-2.0.0" sources."update-notifier-4.1.0" sources."url-parse-lax-3.0.0" @@ -119420,7 +119298,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.58.1" + sources."@types/vscode-1.59.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -119505,7 +119383,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -119540,7 +119418,7 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -119714,7 +119592,7 @@ in sources."vscode-debugadapter-testsupport-1.48.0" sources."vscode-debugprotocol-1.48.0" sources."watchpack-2.2.0" - sources."webpack-5.48.0" + sources."webpack-5.49.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -119867,7 +119745,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.7" sources."got-6.7.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gray-matter-2.1.1" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -120071,7 +119949,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -120371,7 +120249,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -121081,7 +120959,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-2.0.5" sources."glob-7.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."html-encoding-sniffer-2.0.1" sources."http-proxy-agent-4.0.1" @@ -121243,7 +121121,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -121350,7 +121228,7 @@ in sources."delayed-stream-1.0.0" (sources."dispensary-0.62.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" ]; }) sources."doctrine-3.0.0" @@ -121464,7 +121342,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -121472,6 +121350,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" @@ -121488,10 +121367,10 @@ in sources."ini-2.0.0" sources."invert-kv-3.0.1" sources."is-absolute-0.1.7" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -121501,7 +121380,7 @@ in sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-relative-0.1.3" sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" @@ -121535,7 +121414,7 @@ in ]; }) sources."jsprim-1.4.1" - sources."jszip-3.7.0" + sources."jszip-3.7.1" sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-3.1.0" @@ -121779,7 +121658,7 @@ in sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ - sources."async-3.2.0" + sources."async-3.2.1" ]; }) ]; @@ -121796,17 +121675,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz"; - sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz"; + sha512 = "XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -121834,7 +121713,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.796" + sources."electron-to-chromium-1.3.799" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -121849,7 +121728,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."jest-worker-27.0.6" sources."json-parse-better-errors-1.0.2" @@ -121971,7 +121850,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -122179,11 +122058,12 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -122211,11 +122091,11 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-url-3.0.3" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" @@ -122230,7 +122110,7 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" + sources."is-regex-1.1.4" sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -122607,10 +122487,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz"; - sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.4.tgz"; + sha512 = "7YZv5fSs6tf0JPSQT5eT02t+IgZR7sHPGGSbT2ZmE4VO3X1a4WhSIP4tIpQCNxbzcKCCe6NFimpTxlxXNF/KEQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -122625,7 +122505,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -122710,7 +122590,7 @@ in }) sources."core-util-is-1.0.2" sources."cpus-1.0.3" - sources."create-torrent-4.7.2" + sources."create-torrent-5.0.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -122915,7 +122795,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.3.7" // { + (sources."webtorrent-1.3.9" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -123307,7 +123187,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."grouped-queue-2.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -123724,7 +123604,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."smart-buffer-4.1.0" + sources."smart-buffer-4.2.0" sources."socks-2.6.1" (sources."socks-proxy-agent-5.0.1" // { dependencies = [ @@ -123988,7 +123868,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.4.12" + sources."@types/node-16.4.13" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" @@ -123999,7 +123879,7 @@ in sources."delayed-stream-1.0.0" sources."form-data-3.0.1" sources."fs-extra-10.0.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."isexe-2.0.0" sources."jsonfile-6.1.0" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 92d89afe39..79c7a650cf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib , ocaml-migrate-parsetree @@ -7,34 +7,24 @@ , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx +, ocamlnet }: -if !lib.versionAtLeast ocaml.version "4.07" -then throw "eliom is not available for OCaml ${ocaml.version}" -else - stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.4"; + version = "8.6.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz"; + sha256 = "0s1hpawwhqp4qcy8w1067n8c6zg8jcjpzplc39bjbb1ycqw667j9"; }; - patches = [ - # Compatibility with js_of_ocaml >= 3.9.0, remove at next release - (fetchpatch { - url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch"; - sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p"; - }) - ]; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild ocaml-migrate-parsetree js_of_ocaml-ppx_deriving_json opaline ppx_tools_versioned + ocamlnet ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index aac8b27955..25d45d9aed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,46 +1,55 @@ -{ stdenv, lib, fetchFromGitHub, which, ocaml, findlib, lwt_react, ssl, lwt_ssl -, lwt_log, ocamlnet, ocaml_pcre, cryptokit, tyxml, xml-light, ipaddr +{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl +, bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs +, cohttp, cohttp-lwt-unix, hmap +, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr , pgocaml, camlzip, ocaml_sqlite3 , makeWrapper }: -if !lib.versionAtLeast ocaml.version "4.06.1" -then throw "ocsigenserver is not available for OCaml ${ocaml.version}" -else - -let mkpath = p: n: - "${p}/lib/ocaml/${ocaml.version}/site-lib/${n}"; +let mkpath = p: + "${p}/lib/ocaml/${ocaml.version}/site-lib/stublibs"; in -stdenv.mkDerivation rec { - version = "2.18.0"; +let caml_ld_library_path = + lib.concatMapStringsSep ":" mkpath [ + bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit ocaml_pcre + ] +; in + +buildDunePackage rec { + version = "4.0.1"; pname = "ocsigenserver"; + useDune2 = true; + minimalOCamlVersion = "4.08"; + src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; rev = version; - sha256 = "0c61wkq8ddy3qxb2x1jz04rz0722hk92r6jl1zvgikh74m5p5ipp"; + sha256 = "0pid4irkmdmx1d6n2rvcvx5mnljl3hazzdqc3bql72by35izfac6"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which ocaml findlib lwt_react pgocaml camlzip ocaml_sqlite3 ]; + nativeBuildInputs = [ makeWrapper which ]; + buildInputs = [ lwt_react pgocaml camlzip ocaml_sqlite3 ]; - propagatedBuildInputs = [ cryptokit ipaddr lwt_log lwt_ssl ocamlnet - ocaml_pcre tyxml xml-light + propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl + ocaml_pcre xml-light ]; configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; - createFindlibDestdir = true; + postConfigure = '' + make -C src confs + ''; postFixup = '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --suffix CAML_LD_LIBRARY_PATH : "${caml_ld_library_path}" ''; dontPatchShebangs = true; @@ -51,7 +60,7 @@ stdenv.mkDerivation rec { longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; platforms = ocaml.meta.platforms or []; maintainers = [ lib.maintainers.gal_bolle ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 26d5d10acb..ea5609e63b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,37 +1,36 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson , cohttp-lwt-unix , resource-pooling +, ocamlnet }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocsigen-start-${version}"; - version = "2.18.0"; + version = "4.3.0"; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ]; + propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ]; patches = [ ./templates-dir.patch ]; - postPatch = '' - substituteInPlace "src/os_db.ml" --replace "citext" "text" - ''; - - createFindlibDestdir = true; - src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigen-start"; rev = version; - sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50"; + sha256 = "0lkl59dwzyqq2lyr46fyjr27ms0fp9h59xfsn37faaavdd7v0h98"; }; + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR + ''; + meta = { homepage = "http://ocsigen.org/ocsigen-start"; description = "Eliom application skeleton"; longDescription ='' An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.gal_bolle ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix index 2f4a4f0437..fbb75e6133 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; createFindlibDestdir = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix index d24a951020..01b384fe0b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-z3"; inherit (z3-with-ocaml) version; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index b9ee3af9ed..f1033e9e5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "5.1.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5"; + sha256 = "sha256-C799JoW58mmwHeoXLMJ5pYg8hjaZqVBqrbxBXpmF/mQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index f720cdf9b1..4561b79f4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.5.1"; + version = "0.6.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM="; + sha256 = "16lfav83g12vzs3ssfva7chcqqb7xdx54djwfwyn9xcwfaa7cwhw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index 990228039d..f06f4aba2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.5.1"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07"; + sha256 = "0101bw2n6vd3c0p323qqr61wwraja48xbrwcw5sn7i5sa3ygfx0k"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index 2535253dc2..2682b13656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -1,41 +1,52 @@ { lib -, aiohttp -, asynctest +, assertpy , buildPythonPackage , fetchFromGitHub , poetry-core -, pytest-aiohttp , pytest-asyncio +, pytest-mockservers +, pytest-resource-path , pytest-sugar , pytestCheckHook +, time-machine }: buildPythonPackage rec { pname = "aioswitcher"; - version = "1.2.5"; + version = "2.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-eiWmB2DVNAYHPHfnVwv0+4A/wYLgtAa1ReGsmwiIvAk="; + sha256 = "sha256-n4JvtShs2/shJxAzxm6qyipVQ7e3QfeVwhnqu6RWZss="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ - aiohttp - ]; + preCheck = '' + export TZ=Asia/Jerusalem + ''; checkInputs = [ - asynctest - pytest-aiohttp + assertpy pytest-asyncio + pytest-mockservers + pytest-resource-path pytest-sugar pytestCheckHook + time-machine + ]; + + disabledTests = [ + # AssertionError: Expected <14:00> to be equal to <17:00>, but was not. + "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" ]; pythonImportsCheck = [ "aioswitcher" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 8584ba7166..25b36e6985 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -42,9 +42,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace lib/ansible/executor/task_executor.py \ --replace "[python," "[" - - substituteInPlace requirements.txt \ - --replace "resolvelib >= 0.5.3, < 0.6.0" "resolvelib" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix new file mode 100644 index 0000000000..5280808fb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "assertpy"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "assertpy" + ]; + + meta = with lib; { + description = "Simple assertion library for unit testing with a fluent API"; + homepage = "https://github.com/assertpy/assertpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index b5ae2b4baf..b06af4d2bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo="; + sha256 = "1ibyphncb3d8vrs3yk8j6l1smmnibizx9k1vir2njhi09r57h9mx"; }; # OSError: AF_UNIX path too long @@ -26,6 +26,7 @@ buildPythonPackage rec { ]; disabledTests = [ "test_protocol_pause_resume" ]; + pythonImportsCheck = [ "asyncio_dgram" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index db55543ca5..f5d282ac0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -3,16 +3,21 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = version; - sha256 = "1f8828y32yrf87bc933jhmjrvj746baibvpn0w21x3ji81vf6mri"; + sha256 = "120qar8iaxj6dmnhjw1c40n2w06f1nyxy57dwh06xdiany698fg4"; }; + postPatch = '' + substituteInPlace requirements/base.txt \ + --replace 'simplejson==3' 'simplejson~=3' + ''; + propagatedBuildInputs = [ simplejson ]; nativeBuildInputs = [ autoconf automake cmake libtool perl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix new file mode 100644 index 0000000000..7663cf8cf1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, coverage +, gettext +, mock +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "bagit"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "LibraryOfCongress"; + repo = "bagit-python"; + rev = "v${version}"; + hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI="; + }; + + nativeBuildInputs = [ gettext setuptools-scm ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + mock + pytestCheckHook + ]; + pytestFlagsArray = [ "test.py" ]; + pythonImportsCheck = [ "bagit" ]; + + meta = with lib; { + description = "Python library and command line utility for working with BagIt style packages"; + homepage = "https://libraryofcongress.github.io/bagit-python/"; + license = with licenses; [ publicDomain ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 7d8e6ff5be..e52e07627d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -3,31 +3,29 @@ , fetchFromGitHub , click , click-log +, dataclasses , pure-pcapy3 , pyserial-asyncio , voluptuous , zigpy , asynctest +, pythonOlder , pytestCheckHook , pytest-asyncio +, pytest-timeout }: buildPythonPackage rec { pname = "bellows"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0"; + sha256 = "0qbsk5iv3vrpwz7kfmjdbc66rfkg788p6wwxbf6jzfarfhcgrh3k"; }; - prePatch = '' - substituteInPlace setup.py \ - --replace "click-log==0.2.1" "click-log>=0.2.1" - ''; - propagatedBuildInputs = [ click click-log @@ -35,16 +33,31 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses ]; checkInputs = [ - asynctest pytestCheckHook pytest-asyncio + pytest-timeout + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest + ]; + + disabledTests = [ + # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited + #"test_remigrate_forcibly_downgraded_v4" + # RuntimeError: Event loop is closed + "test_thread_already_stopped" + ]; + + pythonImportsCheck = [ + "bellows" ]; meta = with lib; { - description = "A Python 3 project to implement EZSP for EmberZNet devices"; + description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu mvnetbiz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix index f53184a816..b1c5170100 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix @@ -1,7 +1,7 @@ { lib, fetchPypi, isPy27 , buildPythonPackage , traits, apptools, pytestCheckHook -, ipykernel, ipython +, ipykernel, ipython, setuptools }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic"; }; - propagatedBuildInputs = [ traits apptools ]; + propagatedBuildInputs = [ traits apptools setuptools ]; preCheck = '' export HOME=$PWD/HOME diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix index 40ce524c66..792af5a6c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "flufl.lock"; - version = "5.0.5"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "1bnapkg99r6mixn3kh314bqcfk8q54y0cvhjpj87j7dhjpsakfpz"; + sha256 = "1ylahys50vaj7iw6dhlx3gg7vs8cms9sbyvscd06clnk6lqk78ad"; }; propagatedBuildInputs = [ atpublic psutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix index bcc7a4b5c9..e826794435 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = version; + rev = "v${version}"; sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index b29822a507..c79fbb6b90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.8.3"; + version = "4.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq"; + sha256 = "a9c9fed52e2901ad04f9caf73a5dd782e5ce8054f71b346d72f04ddff1b7b432"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix index 3c5de1295c..00e67e40ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -2,6 +2,7 @@ , aiohttp , aioresponses , buildPythonPackage +, dacite , fetchFromGitHub , pytest-asyncio , pytest-error-for-skips @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "gios"; - version = "1.0.2"; + version = "2.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8="; + sha256 = "1xbbp08ssan0b9j6s3vzg8cn421avc0xvahx5fvrb8kcbzkg8ssl"; }; propagatedBuildInputs = [ aiohttp + dacite ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 79dce75278..470ec41f83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.3"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - sha256 = "5453e64ca885c302f54c7a630de15e1e0b2c5ef21107ea69bd96fd694d723d5e"; + sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 873e8169bf..0daff0ac2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.2.0"; + version = "2.3.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1f64b78c854c0629f20903011d6def28c981ce5682a5221031f6ae1caa0a1fea"; + sha256 = "166pcra1x8lisgf7cla4vq97qpc1hrpwnvlj1sza1igny2m59w5i"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index dbeb2c3004..b2e57af84d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -1,19 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core, proto-plus }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, google-api-core, mock, proto-plus, protobuf, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.3.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "eea55e99ceec896ffc98ee3051710a241b7d335f246a0472bbffbb0cb2def453"; + sha256 = "12qwiqb7xrnq42z777j5nxdgka3vv411l9cngka6cr6mx4s83c9l"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; - # No tests in repo - doCheck = false; - + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + checkInputs = [ mock protobuf pytest-asyncio pytestCheckHook ]; pythonImportsCheck = [ "google.cloud.orgpolicy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix index c6de997a1d..14b60f5514 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.4"; + version = "2.7.5"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "08fjdb1q02dwxq8s15ddd00gps64xplblkn8dx5yivldskiy8i1n"; + sha256 = "sha256-CAYyVNVq1rZZ/AYOAE8bfd7f94+PlAsnFRdguparNtY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index 9a7ab056a3..b3165a7e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk="; + sha256 = "1qdvm1bnn7x2mf4fq997gvq6a5901ndhd2s75h92zsgmlcp7rc77"; }; propagatedBuildInputs = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "hatasmota" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index c8cc21278b..e6759f498a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "0bgvrjcf10kiqqkbl56sxx3jydd722b08q2j9c8sxpk0qdrmrinv"; + sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36"; }; propagatedBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { "test_pluggable_switch_measuring" "test_rotary_handle_sensor" "test_security_group" + "test_security_zone" "test_shutter_device" "test_smoke_detector" "test_switching_group" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 72a607505c..177fd89156 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pytest-xdist +, torchvision , pythonOlder , matplotlib , mock @@ -14,16 +15,16 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FGFpaqq7InwRqFmQTmXGpJEjRUB69ZN/l20l42L2BAA="; + sha256 = "sha256-dlKGXjUUnyYmPDilo0LQg9OkSkBnMYNgzlFLIfI0T6I="; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. @@ -38,6 +39,7 @@ buildPythonPackage rec { "--ignore=tests/ignite/contrib/handlers/test_trains_logger.py" "--ignore=tests/ignite/metrics/nlp/test_bleu.py" "--ignore=tests/ignite/metrics/nlp/test_rouge.py" + "--ignore=tests/ignite/metrics/gan" # requires pytorch_fid; tries to download model to $HOME "--ignore=tests/ignite/metrics/test_dill.py" "--ignore=tests/ignite/metrics/test_psnr.py" "--ignore=tests/ignite/metrics/test_ssim.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix index 42bc0c3912..7650e375b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerwallet/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/LedgerHQ/ledgerctl"; description = "A library to control Ledger devices"; license = licenses.mit; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loca/default.nix new file mode 100644 index 0000000000..8ad0a4adbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/loca/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }: + +buildPythonPackage rec { + pname = "loca"; + version = "2.0.1"; + format = "flit"; + disabled = pythonOlder "3.7"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; + }; + + doCheck = false; # all checks are static analyses + pythonImportsCheck = [ "loca" ]; + + meta = with lib; { + description = "Local locations"; + homepage = "https://pypi.org/project/loca"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix index 2fd5366090..169928e48b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook +{ lib, buildPythonPackage, pythonOlder, fetchPypi, wrapQtAppsHook , pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5 }: buildPythonPackage rec { pname = "mayavi"; - version = "4.7.1"; + version = "4.7.3"; - disabled = isPy27; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; - sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; + extension = "tar.gz"; + sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA="; }; postPatch = '' @@ -31,6 +31,7 @@ buildPythonPackage rec { ]; doCheck = false; # Needs X server + pythonImportsCheck = [ "mayavi" ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix index ee7ac9648e..60006c7afc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "nad-receiver"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joopert"; repo = "nad_receiver"; rev = version; - sha256 = "1mylrrvxczhplscayf4hvj56vaqkh7mv32fn9pcvla83y39kg8rw"; + sha256 = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix index 8b1ff86fca..8dcb9a9925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -38,6 +38,10 @@ buildPythonApplication (common // rec { setproctitle ]; + postPatch = '' + substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" + ''; + postBuild = '' DESTDIR="$out" PREFIX="" make install manpages ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index e313d2b8b0..e2c6d8e37f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "5.2.0"; + version = "5.2.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM="; + sha256 = "1w9rhh85z9m3c4rbz6zxlrxglsm5sk5d6796dsj1p1l3b3ad476z"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index cef64c084f..eaeda0ed34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; + sha256 = "035cjm78xakvfi7k8zahjk0xr23p9my67d8jvq5bqrd506awrl0f"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix index c870676034..953f381ff4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyflunearyou"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,10 +23,12 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo="; + sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23"; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -44,7 +46,8 @@ buildPythonPackage rec { # Ignore the examples directory as the files are prefixed with test_. # disabledTestFiles doesn't seem to work here - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "pyflunearyou" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 804b33c2f7..5fc2c5c143 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.3.1"; + version = "0.4.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "0v57n3by9dwckjfmrgf1km4y3gwzj2gk0s9ly64hlaf05zihqnvc"; + sha256 = "sha256-oRRbSoDlHjkOVhVjuOoDScBILbIQpYVxAOclNlnzVMw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index 4e22d52a4c..08924d5157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.7.2"; + version = "2021.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3"; + sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix index 69d7585e8a..a4306fb4ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymata-express/default.nix @@ -7,20 +7,23 @@ buildPythonPackage rec { pname = "pymata-express"; - version = "1.20"; + version = "1.21"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MrYsLab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-spYmd+Cb7Ej5FmniuJYAVVmq0mhOz5fu4+2UUXctRWs="; + rev = version; + sha256 = "1mibyn84kjahrv3kn51yl5mhkyig4piv6wanggzjflh5nm96bhy8"; }; - propagatedBuildInputs = [ pyserial ]; + propagatedBuildInputs = [ + pyserial + ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pymata_express" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index e81a4b8dd6..e6759e736a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.1.2"; + version = "6.1.3"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "v${version}"; - sha256 = "0di07rny3gqdfb0rf7hm3x03rpn7rydpv3lrl7cak2ccpqm0wzhl"; + sha256 = "sha256-ALDNnKgnOjYladDRVothjm3/2Jv1eNxR2wSS+ZL/Fqk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix index 75d8056fa5..59698fa187 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pynvml"; - version = "8.0.4"; + version = "11.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0pfykj1amqh1rixp90rg85v1nj6qmx89fahqr6ii4zlcckffmm68"; + sha256 = "sha256-1fxKItNVtAw0HWugqoiKLU0iUxd9JDkA+EAbfmyssbs="; }; propagatedBuildInputs = [ cudatoolkit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix index aaca4174a2..79d10f8cf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytest-asyncio , pytest-cov , pytestCheckHook , requests @@ -10,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "sha256-rjCV0TTUBgLpVyEUDiIhOdpKV5lWEjmQr4WCUyTQdG0="; + sha256 = "12b0028vp5rh9bg712klgjzm4vl4biyza1j6iyv3pgg25ircang3"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix new file mode 100644 index 0000000000..4022befcb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, pytest +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-mockservers"; + version = "0.6.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Gr1N"; + repo = pname; + rev = version; + sha256 = "0xql0fnw7m2zn103601gqbpyd761kzvgjj2iz9hjsv56nr4z1g9i"; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + aiohttp + pytest-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_mockservers" + ]; + + meta = with lib; { + description = "A set of fixtures to test your requests to HTTP/UDP servers"; + homepage = "https://github.com/Gr1N/pytest-mockservers"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix new file mode 100644 index 0000000000..7476801794 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, colorama +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-resource-path"; + version = "1.3.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "yukihiko-shinoda"; + repo = pname; + rev = "v${version}"; + sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + colorama + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_resource_path" + ]; + + meta = with lib; { + description = "Pytest plugin to provide path for uniform access to test resources"; + homepage = "https://github.com/yukihiko-shinoda/pytest-resource-path"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 35eb79d8b2..0de0015ab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -301,6 +301,11 @@ in buildPythonPackage rec { # Builds in 2+h with 2 cores, and ~15m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; + passthru = { + inherit cudaSupport; + cudaArchList = final_cudaArchList; + }; + meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix index a146cac392..f5c1f43572 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix @@ -7,13 +7,18 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "0.7.1"; + # Currently this package is only used by Ansible and breaking changes + # are frequently introduced, so when upgrading ensure the new version + # is compatible with Ansible + # https://github.com/NixOS/nixpkgs/pull/128636 + # https://github.com/ansible/ansible/blob/devel/requirements.txt + version = "0.5.5"; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; rev = version; - sha256 = "1fqz75riagizihvf4j7wc3zjw6kmg1dd8sf49aszyml105kb33n8"; + sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix index 126ff8f228..5cc87077e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "restfly"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "stevemcgrath"; repo = pname; rev = version; - sha256 = "0cmx15i57cxqw7naz8nkpqjckd6lpd2vszrkl82hvnajdimcd9wy"; + sha256 = "03k1843llpi4ycd450j5x8bd58vxsbfw43p81hsawidsx4c6bk85"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix index 03aed296aa..b68fedbcfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rising"; - version = "0.2.0post0"; + version = "0.2.1"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PhoenixDL"; repo = pname; rev = "v${version}"; - sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c"; + sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI="; }; propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix index 677483e882..ccc5749387 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , poetry-core , pythonOlder @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.0.37"; + version = "0.0.38"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz"; + sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60="; }; nativeBuildInputs = [ @@ -34,15 +33,6 @@ buildPythonPackage rec { websocket-client ]; - patches = [ - # Switch to poetry-core, https://github.com/pavoni/pyroon/pull/43 - (fetchpatch { - name = "use-peotry-core.patch"; - url = "https://github.com/pavoni/pyroon/commit/16f890314683a6c2700fa4da5c937559e2e24bea.patch"; - sha256 = "047bhimr72rwqqyjy7jkfzacdc2ycy81wbmgnvf7xyhgjw1jyvh5"; - }) - ]; - # Tests require access to the Roon API doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix new file mode 100644 index 0000000000..007cca2514 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cachecontrol +, lockfile +, mistune +, rdflib +, rdflib-jsonld +, ruamel_yaml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "schema-salad"; + version = "8.1.20210716111910"; + + src = fetchPypi { + inherit pname version; + sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25"; + }; + + propagatedBuildInputs = [ + cachecontrol + lockfile + mistune + rdflib + rdflib-jsonld + ruamel_yaml + ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # setup for these tests requires network access + "test_secondaryFiles" + "test_outputBinding" + ]; + pythonImportsCheck = [ "schema_salad" ]; + + meta = with lib; { + description = "Semantic Annotations for Linked Avro Data"; + homepage = "https://github.com/common-workflow-language/schema_salad"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix new file mode 100644 index 0000000000..2d7309d882 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shellescape"; + version = "3.8.1"; + + src = fetchFromGitHub { + owner = "chrissimpkins"; + repo = "shellescape"; + rev = "v${version}"; + hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM="; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "shellescape" ]; + + meta = with lib; { + description = "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote)"; + homepage = "https://github.com/chrissimpkins/shellescape"; + license = with licenses; [ mit psfl ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 9128018825..f362c0686f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,16 +6,17 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder , pytz +, types-pytz , voluptuous }: buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.2"; + version = "11.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8="; + sha256 = "17zld62q4qw2z2q7i5kkpnyc3immgc4xs009hp53jq4qc38w0jm5"; }; nativeBuildInputs = [ poetry-core ]; @@ -32,16 +33,23 @@ buildPythonPackage rec { aiohttp backoff pytz + types-pytz voluptuous ]; checkInputs = [ aioresponses asynctest - pytest-asyncio + pytest-aiohttp pytestCheckHook ]; + disabledTests = [ + # simplipy/api.py:253: InvalidCredentialsError + "test_request_error_failed_retry" + "test_update_error" + ]; + disabledTestPaths = [ "examples/" ]; pythonImportsCheck = [ "simplipy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix index af22267413..d45540ba85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.23.1"; + version = "0.23.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; + sha256 = "0qq2k0xy8a5b54nk7h4ipkvq8dpzklhgcwcffhnlcnl1vhq2dh33"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index a5ca456271..2ed8d7086b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.6"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3WhJBBnIl6C0AdEsmSX3ZEVDThzCBguS4UUri80ifGg="; + sha256 = "sha256-02cIOIow+eHBgYa7Dnl7b31j3I8WRxGuTpwHFKL4XYQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index 56dbc588c7..6abaa02d70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.14"; + version = "0.3.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp"; + sha256 = "sha256-akDccWkiFwTwq7dvUxm34BFNS5PnQowqnxVvkPFzxLM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index 2c7328c50d..62dbc118a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -1,19 +1,19 @@ { lib , aiohttp -, websockets , buildPythonPackage , fetchFromGitHub +, websockets }: buildPythonPackage rec { pname = "systembridge"; - version = "1.2.4"; + version = "2.0.4"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8="; + sha256 = "03scbn6khvw1nj73j8kmvyfrxnqcc0wh3ncck4byby6if1an5dvd"; }; propagatedBuildInputs = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "systembridge" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix index 20fad7c18a..7ba82aaec2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix @@ -4,14 +4,13 @@ , fetchFromGitHub , flit , pytestCheckHook -, pytest-cov , numpy , scipy }: buildPythonPackage rec { pname = "threadpoolctl"; - version = "2.1.0"; + version = "2.2.0"; disabled = isPy27; format = "flit"; @@ -20,10 +19,10 @@ buildPythonPackage rec { owner = "joblib"; repo = pname; rev = version; - sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; + sha256 = "7UUjbX1IpXtUAgN48Db43Zr1u360UETSUnIHD6rQRLs="; }; - checkInputs = [ pytestCheckHook pytest-cov numpy scipy ]; + checkInputs = [ pytestCheckHook numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix new file mode 100644 index 0000000000..1c4be8946a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, pythonOlder +, backports-zoneinfo +, python-dateutil +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "time-machine"; + version = "2.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = pname; + rev = version; + sha256 = "1flim8xaa7qglh2b39cf57i8g0kg0707pw3mdkrgh0xjn27bv9bi"; + }; + + propagatedBuildInputs = [ + python-dateutil + #] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # Assertion Errors related to Africa/Addis_Ababa + "test_destination_datetime_tzinfo_zoneinfo" + "test_destination_datetime_tzinfo_zoneinfo_nested" + "test_move_to_datetime_with_tzinfo_zoneinfo" + ]; + + pythonImportsCheck = [ + "time_machine" + ]; + + meta = with lib; { + description = "Travel through time in your tests"; + homepage = "https://github.com/adamchainz/time-machine"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index a42c517ede..fc9905881c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -1,4 +1,5 @@ { lib +, symlinkJoin , buildPythonPackage , fetchFromGitHub , ninja @@ -10,9 +11,18 @@ , pillow , pytorch , pytest +, cudatoolkit +, cudnn +, cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch }: -buildPythonPackage rec { +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; +in buildPythonPackage rec { pname = "torchvision"; version = "0.10.0"; @@ -23,15 +33,22 @@ buildPythonPackage rec { sha256 = "13j04ij0jmi58nhav1p69xrm8dg7jisg23268i3n6lnms37n02kc"; }; - nativeBuildInputs = [ libpng ninja which ]; + nativeBuildInputs = [ libpng ninja which ] + ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/"; TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/"; - buildInputs = [ libjpeg_turbo libpng ]; + buildInputs = [ libjpeg_turbo libpng ] + ++ lib.optionals cudaSupport [ cudnn ]; propagatedBuildInputs = [ numpy pillow pytorch scipy ]; + preBuild = lib.optionalString cudaSupport '' + export TORCH_CUDA_ARCH_LIST="${cudaArchStr}" + export FORCE_CUDA=1 + ''; + # tries to download many datasets for tests doCheck = false; @@ -45,6 +62,7 @@ buildPythonPackage rec { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; license = licenses.bsd3; + platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix new file mode 100644 index 0000000000..4c994f8102 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torrequest/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, requests, pysocks, stem }: + +buildPythonPackage rec { + pname = "torrequest"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-N0XU6j/9qY16A0Njx4ets3qrd72rQAlKTZNzks1NroI="; + }; + + propagatedBuildInputs = [ + pysocks requests stem + ]; + + # This package does not contain any tests. + doCheck = false; + + pythonImportsCheck = [ + "torrequest" + ]; + + meta = with lib; { + homepage = "https://github.com/erdiaker/torrequest"; + description = "Simple Python interface for HTTP(s) requests over Tor"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index 2c2df4878e..27321b4c42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , numpy @@ -7,7 +8,8 @@ , pandas , pyyaml , matplotlib -, pytest +, numba +, pytestCheckHook }: buildPythonPackage rec { @@ -28,25 +30,18 @@ buildPythonPackage rec { pandas pyyaml matplotlib + numba ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - ${lib.optionalString (stdenv.isDarwin) '' + preCheck = lib.optionalString stdenv.isDarwin '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - ''} - - pytest trackpy --ignore trackpy/tests/test_motion.py \ - --ignore trackpy/tests/test_feature_saving.py \ - --ignore trackpy/tests/test_feature.py \ - --ignore trackpy/tests/test_plots.py \ - --ignore trackpy/tests/test_legacy_linking.py ''; meta = with lib; { @@ -54,6 +49,5 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/trackpy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; - broken = true; # not compatible with latest pandas }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix new file mode 100644 index 0000000000..2fc5cc0d45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-pytz"; + version = "2021.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "pytz-stubs" ]; + + meta = with lib; { + description = "Typing stubs for pytz"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index e38d43ef56..cb6ec2b606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.7.1"; + version = "0.8.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi"; + sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix new file mode 100644 index 0000000000..30300c6104 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml-marshaller/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, lib +, lxml +, six +}: + +buildPythonPackage rec { + pname = "xml-marshaller"; + version = "1.0.2"; + + src = fetchPypi { + pname = "xml_marshaller"; + inherit version; + sha256 = "sha256-QvBALLDD8o5nZQ5Z4bembhadK6jcydWKQpJaSmGqqJM="; + }; + + propagatedBuildInputs = [ lxml six ]; + + pythonImportsCheck = [ "xml_marshaller" ]; + + meta = with lib; { + description = "This module allows one to marshal simple Python data types into a custom XML format."; + homepage = "https://www.python.org/community/sigs/current/xml-sig/"; + license = licenses.psfl; + maintainers = with maintainers; [ mazurel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index fa0c0ac6af..ad84bdd1c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.33.2"; + version = "0.33.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "0pcfglxvrd3n6b5hkn169p38flhqr7alj8ipxx1p7kphywywplif"; + sha256 = "sha256-ld8Mo465fJTVNSv6YvKcsPafiIij4PEmeycWB3M3ewU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index 0b7c027c0f..f41b3836db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = version; - sha256 = "sha256-d/yAk8owMu+J1BzlwR5mzF9HkXiE6Kc81AznvsAboy8="; + sha256 = "sha256-NpLhVQfezXbJQMvqqZjr9sc8tCjJgGu5Xk3C5/IDeUQ="; }; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 71f102f366..474e7f309e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -4,7 +4,6 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub -, fetchpatch , jsonschema , pyserial , pyserial-asyncio @@ -19,23 +18,15 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; + sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; }; - patches = [ - (fetchpatch { - # Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1] - url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch"; - sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az"; - }) - ]; - propagatedBuildInputs = [ async-timeout coloredlogs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 8d393606fb..7dab5cda6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -5,46 +5,46 @@ , buildPythonPackage , crccheck , fetchFromGitHub -, pycrypto , pycryptodome , pytest-aiohttp -, pytest-asyncio +, pytest-timeout , pytestCheckHook -, tox -, voluptuous }: +, pythonOlder +, voluptuous +}: buildPythonPackage rec { pname = "zigpy"; - version = "0.35.2"; + version = "0.36.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ="; + sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; }; propagatedBuildInputs = [ aiohttp aiosqlite crccheck - pycrypto pycryptodome voluptuous ]; checkInputs = [ - asynctest pytest-aiohttp - pytest-asyncio + pytest-timeout pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest ]; disabledTests = [ # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited - "test_remigrate_forcibly_downgraded_v4" + #"test_remigrate_forcibly_downgraded_v4" # RuntimeError: Event loop is closed - "test_startup" + #"test_startup" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 18cb2a9871..067b35dde6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.27.1"; + version = "0.28.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o="; + sha256 = "137m9052ndbii0q6zw9vmwsfimai05q9np4wv06nw2p2mhy5x48p"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 6e04e60bfb..4406bb41ae 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -309,7 +309,7 @@ let Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; - Rhdf5lib = [ pkgs.zlib ]; + Rhdf5lib = [ pkgs.zlib.dev ]; Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; rjags = [ pkgs.jags ]; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch b/third_party/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch index dcd9b61798..b5233df445 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch +++ b/third_party/nixpkgs/pkgs/development/r-modules/patches/Rhdf5lib.patch @@ -2,11 +2,11 @@ diff --git a/configure b/configure index e2d292e..b13c0db 100755 --- a/configure +++ b/configure -@@ -2880,6 +2880,7 @@ $MAKE +@@ -3874,6 +3874,7 @@ + echo "building the hdf5 library..."; cd ../; - ## we add the '-w' flag to suppress all the warnings hdf5 prints +sed -i 's#/bin/mv#mv#' configure - ./configure --with-pic --enable-shared=no --enable-cxx \ - --with-szlib \ - CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \ + ./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \ + --with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \ + ${WITH_S3_VFD} \ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index df3c42b471..8dac16f243 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.7"; + version = "2.5.8"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc="; + sha256 = "sha256-XfxzvzGiSBhPVIvdtDifKjkcGK2afWXVWul3Pah3tKo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index af45487a86..4fd0276f7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.156.0"; + version = "0.157.0"; src = fetchFromGitHub { - owner = "facebook"; - repo = "flow"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-aV5qcXxNLljeM3MrXg8ptAST8ARCb3kR83oy5G9fbak="; + owner = "facebook"; + repo = "flow"; + rev = "v${version}"; + sha256 = "sha256-16DDlVCBZ8Rtd5OM9tJUxekzYDAirX1zJ36cyPOv/SU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index a5798c6ad5..6f3b62fc6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k"; + sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm"; }; - vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw"; + vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix index 3f31b92183..8db41ce8bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/async-profiler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "async-profiler"; - version = "1.8.6"; + version = "2.0"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - sha256 = "sha256-MtRO0tbo4kDHcQmir8ulv0q1Qh+KnKIshb1NDtu1SKg="; + sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738="; }; buildInputs = [ jdk8 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix index 51fd32bd9d..b214f89eac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix @@ -3,8 +3,8 @@ let xplat = fetchurl { - url = "https://github.com/mono/msbuild/releases/download/0.08/mono_msbuild_6.4.0.208.zip"; - sha256 = "05k7qmnhfvrdgyjn6vp81jb97y21m261jnwdyqpjqpcmzz18j93g"; + url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; + sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q"; }; deps = map (package: package.src) @@ -23,11 +23,11 @@ in stdenv.mkDerivation rec { pname = "msbuild"; - version = "16.8+xamarinxplat.2020.07.30.15.02"; + version = "16.10.1+xamarinxplat.2021.05.26.14.00"; src = fetchurl { url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz"; - sha256 = "10amyca78b6pjfsy54b1rgwz2c1bx0sfky9zhldvzy4divckp25g"; + sha256 = "05ghqqkdj4s3d0xkp7mkdzjig5zj3k6ajx71j0g2wv6rdbvg6899"; }; nativeBuildInputs = [ @@ -47,16 +47,17 @@ stdenv.mkDerivation rec { LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; - patches = [ - (fetchpatch { - url = "https://github.com/mono/msbuild/commit/cad85cefabdaa001fb4bdbea2f5bf1d1cdb83c9b.patch"; - sha256 = "1s8agc7nxxs69b3fl1v1air0c4dpig3hy4sk11l1560jrlx06dhh"; - }) - ]; - postPatch = '' + # not patchShebangs, there is /bin/bash in the body of the script as well + substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} + + patchShebangs eng/*.sh mono/build/*.sh + sed -i -e "/<\/projectImportSearchPaths>/a " \ src/MSBuild/app.config + + # license check is case sensitive + mv LICENSE license.bak && mv license.bak license ''; buildPhase = '' @@ -70,9 +71,6 @@ stdenv.mkDerivation rec { nuget add $package -Source nixos done - # license check is case sensitive - mv LICENSE license.bak && mv license.bak license - mkdir -p artifacts unzip ${xplat} -d artifacts mv artifacts/msbuild artifacts/mono-msbuild @@ -82,9 +80,10 @@ stdenv.mkDerivation rec { # overwrite the file echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh + echo "#!${stdenv.shell}" > mono/build/get_sdk_files.sh - # not patchShebangs, there is /bin/bash in the body of the script as well - substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} + mkdir -p mono/dotnet-overlay/msbuild-bin + cp ${dotnet-sdk}/sdk/*/{Microsoft.NETCoreSdk.BundledVersions.props,RuntimeIdentifierGraph.json} mono/dotnet-overlay/msbuild-bin # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa # TODO there are some (many?) failing tests diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix index 32d1c9569a..4a006428a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/deps.nix @@ -1,41 +1,81 @@ { fetchurl }: [ + { + name = "benchmarkdotnet"; + version = "0.12.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet/0.12.1/benchmarkdotnet.0.12.1.nupkg"; + sha256 = "0whk81a0v70lkhcd9yffls6vnqnc63hw6jfx8mr7iqp02jbrb15w"; + }; + } + { + name = "benchmarkdotnet.annotations"; + version = "0.12.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/benchmarkdotnet.annotations/0.12.1/benchmarkdotnet.annotations.0.12.1.nupkg"; + sha256 = "061v8zdp69a80vb9gf5n8di2qqz6bwj2215shgsw40i0s8j3flw3"; + }; + } + { + name = "commandlineparser"; + version = "2.4.3"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/commandlineparser/2.4.3/commandlineparser.2.4.3.nupkg"; + sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; + }; + } { name = "fsharp.net.sdk"; version = "1.0.4-bundled-0100"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/fsharp.net.sdk/1.0.4-bundled-0100/fsharp.net.sdk.1.0.4-bundled-0100.nupkg"; - sha256 = "0zy4n2an2jh3xrdy1m5fjvynpd0b66i0hkpqdhy2q6d7dj0ks351"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/fsharp.net.sdk/1.0.4-bundled-0100/fsharp.net.sdk.1.0.4-bundled-0100.nupkg"; + sha256 = "06hydwby6pzqzzcxmz4z8v5hiiylhzldl7ggfvr4c5xhpb6bcl78"; + }; + } + { + name = "iced"; + version = "1.4.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/iced/1.4.0/iced.1.4.0.nupkg"; + sha256 = "1l8l20clb56vfsjcpspz0z4f3gy3mr2nwilbb8wjlr5fhx6g23n9"; }; } { name = "illink.tasks"; - version = "0.1.6-prerelease.19380.1"; + version = "0.1.6-prerelease.20175.2"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/illink.tasks/0.1.6-prerelease.19380.1/illink.tasks.0.1.6-prerelease.19380.1.nupkg"; - sha256 = "1ihgzhizgiijg2kj38fn6hsinvxi7bvl0dpk7mbgc08rpgfdsvja"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/7d9f5c21-0d79-403f-bfe3-9a4506529760/nuget/v3/flat2/illink.tasks/0.1.6-prerelease.20175.2/illink.tasks.0.1.6-prerelease.20175.2.nupkg"; + sha256 = "0s4fk48m255n3figh0nnw8cp40qk33khq56sjqnippbk8n6w487z"; + }; + } + { + name = "jnm2.referenceassemblies.net35"; + version = "1.0.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/jnm2.referenceassemblies.net35/1.0.1/jnm2.referenceassemblies.net35.1.0.1.nupkg"; + sha256 = "10dplszwicqnjyxbxkyc3cs0kzqvcrf73pmbxxd0rmqnakz23a7c"; }; } { name = "largeaddressaware"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/largeaddressaware/1.0.3/largeaddressaware.1.0.3.nupkg"; - sha256 = "1ppss9bgj0hf5s8307bnm2a4qm10mrymp0v12m28a5q81zjz0fr5"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/largeaddressaware/1.0.5/largeaddressaware.1.0.5.nupkg"; + sha256 = "0hsjh3m3wr5bfy82bzn606iin35ps03lzfrn3hvjgcn1w68d6291"; }; } { name = "microbuild.core"; version = "0.2.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core/0.2.0/microbuild.core.0.2.0.nupkg"; - sha256 = "1ya040l8fhi0hhira8kwdmv7cc88ar7kiixkpxirgcn9gmpn7ggv"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microbuild.core/0.2.0/microbuild.core.0.2.0.nupkg"; + sha256 = "0q4s45jskbyxfx4ay6znnvv94zma2wd85b8rwmwszd2nb0xl3194"; }; } { name = "microbuild.core.sentinel"; version = "1.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microbuild.core.sentinel/1.0.0/microbuild.core.sentinel.1.0.0.nupkg"; sha256 = "035kqx5fkapql108n222lz8psvxk04mv3dy1qg3h08i4b8j3dy8i"; }; } @@ -43,7 +83,7 @@ name = "microsoft.bcl.asyncinterfaces"; version = "1.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }; } @@ -51,15 +91,15 @@ name = "microsoft.build"; version = "14.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.build/14.3.0/microsoft.build.14.3.0.nupkg"; - sha256 = "16jzspb0qj9szjfhhmb836vgqdq4m1gk3y816qg2mdjmv52r91dh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/14.3.0/microsoft.build.14.3.0.nupkg"; + sha256 = "1zamn3p8xxi0wsjlpln0y71ncb977f3fp08mvaz4wmbmi76nr0rz"; }; } { name = "microsoft.build.centralpackageversions"; version = "2.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.centralpackageversions/2.0.1/microsoft.build.centralpackageversions.2.0.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.centralpackageversions/2.0.1/microsoft.build.centralpackageversions.2.0.1.nupkg"; sha256 = "17cjiaj2b98q8s89168g42jb8rhwm6062jcbv57rbkdiiwdsn55k"; }; } @@ -67,31 +107,31 @@ name = "microsoft.build.framework"; version = "14.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.build.framework/14.3.0/microsoft.build.framework.14.3.0.nupkg"; - sha256 = "19p1w27d3qi09fxag0byvjrv6x54nd5fkiszqzqr7676r90aswxh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/14.3.0/microsoft.build.framework.14.3.0.nupkg"; + sha256 = "0r7y1i7dbr3pb53fdrh268hyi627w85nzv2iblwyg8dzkfxraafd"; }; } { name = "microsoft.build.framework"; version = "15.5.180"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/15.5.180/microsoft.build.framework.15.5.180.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.5.180/microsoft.build.framework.15.5.180.nupkg"; sha256 = "064y3a711ikx9pm9d2wyms4i3k4f9hfvn3vymhwygg7yv7gcj92z"; }; } { name = "microsoft.build.nugetsdkresolver"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/microsoft.build.nugetsdkresolver/5.7.0-rtm.6710/microsoft.build.nugetsdkresolver.5.7.0-rtm.6710.nupkg"; - sha256 = "07zi6akd5iqq6q3cwc273vvfx70dn2lzx1ham4pzlq7dh7gq3vha"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.nugetsdkresolver/5.9.1-rc.8/microsoft.build.nugetsdkresolver.5.9.1-rc.8.nupkg"; + sha256 = "1dgxkal27rqlnz0ppbmbg4v7yla5wb9s2djk5cb6bpsqy2ngd88d"; }; } { name = "microsoft.build.tasks.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; sha256 = "1gwlhvqlkvs5c7qjky726alf71xflbh3x970g3dypfczi0y6gccx"; }; } @@ -99,87 +139,135 @@ name = "microsoft.build.utilities.core"; version = "14.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.build.utilities.core/14.3.0/microsoft.build.utilities.core.14.3.0.nupkg"; - sha256 = "0xk5n4i40w53amrd7bxlhikdvmh8z2anrk99pvz2rf50v946g6li"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/14.3.0/microsoft.build.utilities.core.14.3.0.nupkg"; + sha256 = "0351nsnx12nzkss6vaqwwh7d7car7hrgyh0vyd4bl83c4x3ls1kb"; }; } { name = "microsoft.build.utilities.core"; version = "15.5.180"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/15.5.180/microsoft.build.utilities.core.15.5.180.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.5.180/microsoft.build.utilities.core.15.5.180.nupkg"; sha256 = "0c4bjhaqgc98bchln8p5d2p1vyn8qrha2b8gpn2l7bnznbcrd630"; }; } { - name = "microsoft.codeanalysis.build.tasks"; - version = "3.0.0-beta3-19064-03"; + name = "microsoft.codeanalysis.analyzers"; + version = "2.6.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.codeanalysis.build.tasks/3.0.0-beta3-19064-03/microsoft.codeanalysis.build.tasks.3.0.0-beta3-19064-03.nupkg"; - sha256 = "1l01l0jyqgs8ix5v6b6n0q4yv1y1khr14dh7pw0qivkc5gsys19v"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/2.6.1/microsoft.codeanalysis.analyzers.2.6.1.nupkg"; + sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp"; + }; + } + { + name = "microsoft.codeanalysis.build.tasks"; + version = "3.9.0-5.21112.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.build.tasks/3.9.0-5.21112.8/microsoft.codeanalysis.build.tasks.3.9.0-5.21112.8.nupkg"; + sha256 = "18wvmkpvp1yq288xryap3v07clhs36xiw6vyk4j59i2aqnjjnmc7"; + }; + } + { + name = "microsoft.codeanalysis.common"; + version = "2.10.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/2.10.0/microsoft.codeanalysis.common.2.10.0.nupkg"; + sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj"; + }; + } + { + name = "microsoft.codeanalysis.csharp"; + version = "2.10.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp/2.10.0/microsoft.codeanalysis.csharp.2.10.0.nupkg"; + sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk"; }; } { name = "microsoft.codecoverage"; - version = "16.1.1"; + version = "16.6.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.codecoverage/16.1.1/microsoft.codecoverage.16.1.1.nupkg"; - sha256 = "0xca3sys0a5ilz16ic7g4gds2b974nvmf89qwr1i6v8f7illhda5"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codecoverage/16.6.1/microsoft.codecoverage.16.6.1.nupkg"; + sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; }; } { - name = "microsoft.diasymreader.pdb2pdb"; - version = "1.1.0-beta2-19521-03"; + name = "microsoft.diagnostics.netcore.client"; + version = "0.2.61701"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.diasymreader.pdb2pdb/1.1.0-beta2-19521-03/microsoft.diasymreader.pdb2pdb.1.1.0-beta2-19521-03.nupkg"; - sha256 = "1r82h0qiah2xx9rg8lvfvfdzxz60zd6vfs8kvck0csha5psmn56w"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.netcore.client/0.2.61701/microsoft.diagnostics.netcore.client.0.2.61701.nupkg"; + sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; + }; + } + { + name = "microsoft.diagnostics.runtime"; + version = "1.1.57604"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.runtime/1.1.57604/microsoft.diagnostics.runtime.1.1.57604.nupkg"; + sha256 = "1gm9gsg3h9ipcvwzp7jfns030c4b6l4cpkpyx9ccphlax9mvmfsi"; + }; + } + { + name = "microsoft.diagnostics.tracing.traceevent"; + version = "2.0.49"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diagnostics.tracing.traceevent/2.0.49/microsoft.diagnostics.tracing.traceevent.2.0.49.nupkg"; + sha256 = "08ww98l9a4cx52h3y8w1x5vzl4jf02a66wf9z1j2py406wjifja9"; }; } { name = "microsoft.dotnet.arcade.sdk"; - version = "1.0.0-beta.20365.6"; + version = "5.0.0-beta.21226.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.arcade.sdk/1.0.0-beta.20365.6/microsoft.dotnet.arcade.sdk.1.0.0-beta.20365.6.nupkg"; - sha256 = "1ypsxq3ljdfwvrqyg6b8ii8mbqnjcb2vdr17jc4h0mdmkj0rlcdl"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/5.0.0-beta.21226.1/microsoft.dotnet.arcade.sdk.5.0.0-beta.21226.1.nupkg"; + sha256 = "1d7pczd99cladgmblq8g1dqw88n3aqg7rf8bpsabqrjjrz0pfi43"; }; } { name = "microsoft.dotnet.msbuildsdkresolver"; - version = "3.1.400-preview.20365.4"; + version = "5.0.300-servicing.21267.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.msbuildsdkresolver/3.1.400-preview.20365.4/microsoft.dotnet.msbuildsdkresolver.3.1.400-preview.20365.4.nupkg"; - sha256 = "0ifhk0whgbq0yw075al8sb14ajcnvyp883srx1j62vil9gfz0fp9"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a8a526e9-91b3-4569-ba2d-ff08dbb7c110/nuget/v3/flat2/microsoft.dotnet.msbuildsdkresolver/5.0.300-servicing.21267.11/microsoft.dotnet.msbuildsdkresolver.5.0.300-servicing.21267.11.nupkg"; + sha256 = "1jgg2akhpgfndqfdcyvm7b83nxva9h86nivc7p6dw8rcvazffbp5"; + }; + } + { + name = "microsoft.dotnet.platformabstractions"; + version = "2.1.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.dotnet.platformabstractions/2.1.0/microsoft.dotnet.platformabstractions.2.1.0.nupkg"; + sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }; } { name = "microsoft.dotnet.signtool"; - version = "1.0.0-beta.20365.6"; + version = "5.0.0-beta.21226.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.dotnet.signtool/1.0.0-beta.20365.6/microsoft.dotnet.signtool.1.0.0-beta.20365.6.nupkg"; - sha256 = "0zaw9hc19ldms3jy6n27x4p9clzz3nvpddyacwhgqiahjw2wqasz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.signtool/5.0.0-beta.21226.1/microsoft.dotnet.signtool.5.0.0-beta.21226.1.nupkg"; + sha256 = "1jd3648n3i9i1njx8wb9g8i29s3n5srx3whdhvrkwjm9g5n11gbj"; }; } { name = "microsoft.net.build.extensions"; version = "3.1.400-preview.20365.20"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.build.extensions/3.1.400-preview.20365.20/microsoft.net.build.extensions.3.1.400-preview.20365.20.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.build.extensions/3.1.400-preview.20365.20/microsoft.net.build.extensions.3.1.400-preview.20365.20.nupkg"; sha256 = "1vmcj7p7jsr1lbkbxqqjsixkaxdazr5nwhhp1q402dgky9cayhd5"; }; } { name = "microsoft.net.compilers.toolset"; - version = "3.7.0-5.20367.1"; + version = "3.9.0-5.21112.8"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.compilers.toolset/3.7.0-5.20367.1/microsoft.net.compilers.toolset.3.7.0-5.20367.1.nupkg"; - sha256 = "1z8hzzmxs8jchq1jmmmwhpf3hsvrj803y3zb8j3xg9xkbnryfzwk"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.9.0-5.21112.8/microsoft.net.compilers.toolset.3.9.0-5.21112.8.nupkg"; + sha256 = "1drcxgay9ylhs6dr3alnxr4lfapzlr86w3mpwp0gn58mfj5m0g1h"; }; } { name = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }; } @@ -187,7 +275,7 @@ name = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }; } @@ -195,31 +283,39 @@ name = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; - sha256 = "1gn085ddzn8psqfhmwcjzq2zrmb5gca2liap79a43wyw4gs8ip78"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }; } { name = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; - sha256 = "0idlsfwd9sn4p9jr1dqi14b8n2ly0k4dnjpvh8jfhxgnzzl98z5k"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }; } { name = "microsoft.netframework.referenceassemblies"; version = "1.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }; } + { + name = "microsoft.netframework.referenceassemblies.net45"; + version = "1.0.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg"; + sha256 = "1ipafi0zjrnzsfmwsisgp8z6m26cbw7vb3jj501nvz3v97b7d7lv"; + }; + } { name = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }; } @@ -227,7 +323,7 @@ name = "microsoft.net.sdk"; version = "3.1.400-preview.20365.20"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.sdk/3.1.400-preview.20365.20/microsoft.net.sdk.3.1.400-preview.20365.20.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk/3.1.400-preview.20365.20/microsoft.net.sdk.3.1.400-preview.20365.20.nupkg"; sha256 = "02ann6rsnc6wl84wsk2fz7dpxcp5sq0b6jm3vv23av4b1f86f82y"; }; } @@ -235,7 +331,7 @@ name = "microsoft.net.sdk.publish"; version = "3.1.300-servicing.20216.7"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.sdk.publish/3.1.300-servicing.20216.7/microsoft.net.sdk.publish.3.1.300-servicing.20216.7.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.publish/3.1.300-servicing.20216.7/microsoft.net.sdk.publish.3.1.300-servicing.20216.7.nupkg"; sha256 = "1xivqihp2zrkmd4f65fgh9hn9ix75sqklbnanqlfk9dq67wscp41"; }; } @@ -243,7 +339,7 @@ name = "microsoft.net.sdk.razor"; version = "3.1.6"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.sdk.razor/3.1.6/microsoft.net.sdk.razor.3.1.6.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.sdk.razor/3.1.6/microsoft.net.sdk.razor.3.1.6.nupkg"; sha256 = "1vw0zi0lq52frivq8mgfvm79rfx0v492q6fci1jls1zwwjk0v9ia"; }; } @@ -251,7 +347,7 @@ name = "microsoft.net.sdk.web"; version = "3.1.300-servicing.20216.7"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.sdk.web/3.1.300-servicing.20216.7/microsoft.net.sdk.web.3.1.300-servicing.20216.7.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web/3.1.300-servicing.20216.7/microsoft.net.sdk.web.3.1.300-servicing.20216.7.nupkg"; sha256 = "001jd2iwww0vb5x5dii915z82syh1aj48n62bn8zi1d3chwacr51"; }; } @@ -259,23 +355,23 @@ name = "microsoft.net.sdk.web.projectsystem"; version = "3.1.300-servicing.20216.7"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.net.sdk.web.projectsystem/3.1.300-servicing.20216.7/microsoft.net.sdk.web.projectsystem.3.1.300-servicing.20216.7.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d5f6139d-6136-4228-8b2d-9676e9e4eb3d/nuget/v3/flat2/microsoft.net.sdk.web.projectsystem/3.1.300-servicing.20216.7/microsoft.net.sdk.web.projectsystem.3.1.300-servicing.20216.7.nupkg"; sha256 = "0601mix6l18h8afxxgdbbv695d0sjskady209z52sf4bvf4h4kal"; }; } { name = "microsoft.net.test.sdk"; - version = "16.1.1"; + version = "16.6.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.test.sdk/16.1.1/microsoft.net.test.sdk.16.1.1.nupkg"; - sha256 = "13mcqv85yf4f1rx06sz5ff4pcmbr4rkgqkqzmwl8ywadbh523125"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.test.sdk/16.6.1/microsoft.net.test.sdk.16.6.1.nupkg"; + sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; }; } { name = "microsoft.sourcelink.azurerepos.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; sha256 = "00hfjh8d3z5np51qgr1s3q4j7bl34mfiypf7nbxcmxa7cyj0rg65"; }; } @@ -283,7 +379,7 @@ name = "microsoft.sourcelink.common"; version = "1.1.0-beta-20206-02"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; sha256 = "1qv0k0apxv3j1pccki2rzakjfb0868hmg0968da0639f75s3glr9"; }; } @@ -291,15 +387,23 @@ name = "microsoft.sourcelink.github"; version = "1.1.0-beta-20206-02"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; sha256 = "0q1mgjjkwxvzn5v29pqiyg0j0jwi5qc0q04za9k1x138kliq2iba"; }; } + { + name = "microsoft.symboluploader.build.task"; + version = "1.1.145102"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.symboluploader.build.task/1.1.145102/microsoft.symboluploader.build.task.1.1.145102.nupkg"; + sha256 = "1nmd0cgj3kp2n1k8bzvvq7cfbpbrvk1k6mx9lpnzh1bv7v67rvm2"; + }; + } { name = "microsoft.visualstudio.sdk.embedinteroptypes"; version = "15.0.15"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15/microsoft.visualstudio.sdk.embedinteroptypes.15.0.15.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.sdk.embedinteroptypes/15.0.15/microsoft.visualstudio.sdk.embedinteroptypes.15.0.15.nupkg"; sha256 = "0chr3slzzcanwcyd9isx4gichqzmfh4zd3h83piw0r4xsww1wmpd"; }; } @@ -307,295 +411,319 @@ name = "microsoft.visualstudio.setup.configuration.interop"; version = "1.16.30"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; }; } { name = "microsoft.web.xdt"; - version = "2.1.2"; + version = "3.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.web.xdt/2.1.2/microsoft.web.xdt.2.1.2.nupkg"; - sha256 = "1as6cih26xyxjsa5ibqik1fwbyxl58ivpngidr6w1nh5fi5zg9zw"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.web.xdt/3.0.0/microsoft.web.xdt.3.0.0.nupkg"; + sha256 = "18biff0hglccy34909zm9hc4lr9p8n2p155snq1dddp0av6m448n"; }; } { name = "microsoft.win32.primitives"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; - sha256 = "1pviskapkc6qm108r0q2x15vkgyqsczf9xpmrlm42q68ainc9ai3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }; } { name = "microsoft.win32.primitives"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; - sha256 = "1nvwzj039y9ngdpz7zg0vszvrr3za2vfmjg222jc8c1dibk6y6ah"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }; + } + { + name = "microsoft.win32.registry"; + version = "4.5.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg"; + sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }; } { name = "netstandard.library"; version = "1.6.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; - sha256 = "03pxpc6dzpw56l8qhcb0wzvirqgs3c008jcakqxvfqmy25m3dnyn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }; + } + { + name = "newtonsoft.json"; + version = "11.0.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/11.0.1/newtonsoft.json.11.0.1.nupkg"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; }; } { name = "newtonsoft.json"; version = "9.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; - sha256 = "1qayanmqh3xiw0bjwm825j1n6nvbhc6yqkdpaawpyd0l71d5qh13"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }; } { name = "nuget.build.tasks"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.build.tasks/5.7.0-rtm.6710/nuget.build.tasks.5.7.0-rtm.6710.nupkg"; - sha256 = "0zwacvci3y8xyhy6jzc0wd20rzgb6lzv0ci8a4qg8ay315bmd9sp"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks/5.9.1-rc.8/nuget.build.tasks.5.9.1-rc.8.nupkg"; + sha256 = "0610dh53gqmzbl70jxmn9jbvl0lv70qanis1q20rxnnyq6s2xb75"; }; } { name = "nuget.build.tasks.pack"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.build.tasks.pack/5.7.0-rtm.6710/nuget.build.tasks.pack.5.7.0-rtm.6710.nupkg"; - sha256 = "16scfs0gwfs9r5kp65jfz3ip7w56xyni6fwgpmj0y6dbazzqm6zs"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.build.tasks.pack/5.9.1-rc.8/nuget.build.tasks.pack.5.9.1-rc.8.nupkg"; + sha256 = "10qkdv165vz71z8ir3161ggaarbqk51gwg8n51iwxa5inz4y22lj"; }; } { name = "nuget.commandline"; version = "4.1.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.commandline/4.1.0/nuget.commandline.4.1.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.commandline/4.1.0/nuget.commandline.4.1.0.nupkg"; sha256 = "03ik0rcdl7vdwxa9fx5cgl98yzb45swr08jmrnjk1ympjqvf94s1"; }; } { name = "nuget.commands"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.commands/5.7.0-rtm.6710/nuget.commands.5.7.0-rtm.6710.nupkg"; - sha256 = "0sm2x95q8y0sab7fsb2sqqhvw2x0scsavv968jxjf3ynb5n155q3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.commands/5.9.1-rc.8/nuget.commands.5.9.1-rc.8.nupkg"; + sha256 = "0rdziczdkrqwl6wjqs4w29c460kc69v9z2pghqjlkag25c7hqwlr"; }; } { name = "nuget.common"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.common/5.7.0-rtm.6710/nuget.common.5.7.0-rtm.6710.nupkg"; - sha256 = "07wxir208mmfzi2xxhn8xskbchx9d7nahmy2xqcx09mwkkr7m0qg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; + sha256 = "056b1h4fvik6z2qc2s6qzz0s4acbipc50af14fbr7hd9h2fxya4c"; }; } { name = "nuget.configuration"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.configuration/5.7.0-rtm.6710/nuget.configuration.5.7.0-rtm.6710.nupkg"; - sha256 = "1h9r627nj3bhwfwzf2b265s5zl00sj5z5x085a6l8qg2v8sig628"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; + sha256 = "0x8vigf0sfp6kf1i98xcr4k84vci596x16hmajdm0zgv3p1w2kvk"; }; } { name = "nuget.credentials"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.credentials/5.7.0-rtm.6710/nuget.credentials.5.7.0-rtm.6710.nupkg"; - sha256 = "06yd4ny5nzpxl6n3l57n585inj0bjybcmwcz0w3clyib9l2ybsjz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.credentials/5.9.1-rc.8/nuget.credentials.5.9.1-rc.8.nupkg"; + sha256 = "128vsgz4rfrp17ys7vbc978y6inmvki93mswm82qvphxymsyrc6v"; }; } { name = "nuget.dependencyresolver.core"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.dependencyresolver.core/5.7.0-rtm.6710/nuget.dependencyresolver.core.5.7.0-rtm.6710.nupkg"; - sha256 = "0s3qlwg98qd5brfh6k9lsviqpij8n73ci54c9bmal56k12hkvfdm"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; + sha256 = "1q9a97s1z3a6fb4p82ag2lqnzl53895prbqwlbvckdw9c3rpz3gc"; }; } { name = "nuget.frameworks"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.frameworks/5.7.0-rtm.6710/nuget.frameworks.5.7.0-rtm.6710.nupkg"; - sha256 = "05g4aaq3gc1p104dpanr255xcag399918m02vpanf29qpz3g325d"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; + sha256 = "1n3mp9ns79yq4dwgj7h2av3b485mzgsw0qlj8z7p47krwlzp5hiv"; }; } { name = "nuget.librarymodel"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.librarymodel/5.7.0-rtm.6710/nuget.librarymodel.5.7.0-rtm.6710.nupkg"; - sha256 = "1pj5y29f21ch4sgwg5xx4n0lsd1qiiyjy6ly6vaabfrimx4d0s23"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; + sha256 = "0sy8422c94wcg8ka85lnawq26mpixl79avk9m6y44lshrpga5v4v"; }; } { name = "nuget.packagemanagement"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.packagemanagement/5.7.0-rtm.6710/nuget.packagemanagement.5.7.0-rtm.6710.nupkg"; - sha256 = "1kiix6r2birnrlwki5mb5a7sbxh8wqj87f69qid6dr556x2w8h9z"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packagemanagement/5.9.1-rc.8/nuget.packagemanagement.5.9.1-rc.8.nupkg"; + sha256 = "0mcxdqq3hfhxyn99pp5b5x2cd8rrmw6z616cbd9y0s9j0i6hm4pg"; }; } { name = "nuget.packaging"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.packaging/5.7.0-rtm.6710/nuget.packaging.5.7.0-rtm.6710.nupkg"; - sha256 = "16frbw8k81cazary6d8sbdccr6hv57rc7rzdi9bagdnzvpm8h13l"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; + sha256 = "0x9c3v741nn6m2xgidna88fa4xj5avhv6asj73hqv4pzpdprlrhv"; }; } { name = "nuget.projectmodel"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.projectmodel/5.7.0-rtm.6710/nuget.projectmodel.5.7.0-rtm.6710.nupkg"; - sha256 = "11i1kyqvmq70rkqrxhxnhsihaxx32ww0l9175473mmyia3wrbwyw"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; + sha256 = "1xjh7isw467nkc7dkfj3wlw69vi2cns66z152jrzjdmxmia3i3pv"; }; } { name = "nuget.protocol"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.protocol/5.7.0-rtm.6710/nuget.protocol.5.7.0-rtm.6710.nupkg"; - sha256 = "1515p7a4kdm9wr8iizcmvzwqphxsfwqbnq41jv8mibrx7vih0s90"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; + sha256 = "1rnrxzaciqhhgwd4by0dhkvfrm1h161vvmkvlcwaz2589sqq2dzq"; }; } { name = "nuget.resolver"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.resolver/5.7.0-rtm.6710/nuget.resolver.5.7.0-rtm.6710.nupkg"; - sha256 = "17bm159knhx7iznm9ilk3mwb0n1gh1dp0ihhapyb1fmh9ings30b"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.resolver/5.9.1-rc.8/nuget.resolver.5.9.1-rc.8.nupkg"; + sha256 = "0q6dqg0d5f9y7ynwqmzkzwl6yan94azvm0cd385k210y8wn4364v"; }; } { name = "nuget.versioning"; - version = "5.7.0-rtm.6710"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/9d15d80a-6afc-4f7e-901b-9378146a4b8b/nuget/v3/flat2/nuget.versioning/5.7.0-rtm.6710/nuget.versioning.5.7.0-rtm.6710.nupkg"; - sha256 = "1kj9xvcbwvvhhi45bi6f9m1cv8wx6y4xfmnxc8liwcgwh9gvwdjl"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; + sha256 = "1vv7z122ilsk2rsvjm6j3hpifb45g8wa1mgnq1kwi9k8b2dbb6vv"; + }; + } + { + name = "perfolizer"; + version = "0.2.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/perfolizer/0.2.1/perfolizer.0.2.1.nupkg"; + sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }; } { name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "10a3jqkh1h23qsn7pjlji61d7dph7qy8c6ssfjqmlgydm4rnin64"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }; } { name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1md38ys5h8srinnq9qxz47c9i27x7pv84avdi3rbq68hfkcslx93"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }; } { name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0cgvqxccg4lkxiyvw3jrn71pbybbbcd3i8v6v4przgrr7f7k6nfj"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }; } { name = "runtime.native.system"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; - sha256 = "0fwsjhqj235hhy2zl8x3a828whn4nck7jr7hi09ccbk24xf4f17f"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }; } { name = "runtime.native.system"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; - sha256 = "02gnfm33gf163kybkahfza8q10jp890hiczcnbg2aasf1n0jq857"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }; } { name = "runtime.native.system.io.compression"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; - sha256 = "05370qi83pxfyn3whzkjjwb4q80vlr3mbz0dfa0hc0cbl5jx4y20"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }; } { name = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1il7m43j4nq15xf01npgxd8q83q8mkk4xk07dd7g0sfsxm9k127d"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }; } { name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1pr8ji41rsifx6yh89xg1yw45g5snw96xxqw0g3q48rbdg5j79iw"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }; } { name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1r8hllb6fdb4adij7b7ld32hf5r5jxyqh4pacrvfgjckmyx8js8c"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }; } { name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "16r149hajvr8ikyjbsw2m67yqfvxg6j1sb2slw9pzrly06mxmpks"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }; } { name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0j2f2v1nm7sys6qpljhp4s18zz3hblymjl60yrccqfac7yr9hxrq"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }; } { name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0wgz0y2fm6xcnlmpl1zh5963ribjbnzr2l6prsw3xi7sbfyjyi8c"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }; } { name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "0qr13ykxj7zs7i8z0x63v8za2h33ndnvvw83wffp9xbb2fibj3gi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }; } { name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; - sha256 = "1jg8gfh261zqmimf5ba76djr201q0bamm2385zxni5jnyyc4iis4"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }; } { name = "shouldly"; version = "3.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/shouldly/3.0.0/shouldly.3.0.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/shouldly/3.0.0/shouldly.3.0.0.nupkg"; sha256 = "1hg28w898kl84rx57sclb2z9b76v5hxlwxig1xnb6fr81aahzlw3"; }; } @@ -603,7 +731,7 @@ name = "sn"; version = "1.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/sn/1.0.0/sn.1.0.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/sn/1.0.0/sn.1.0.0.nupkg"; sha256 = "1012fcdc6vq2355v86h434s6p2nnqgpdapb7p25l4h39g5q8p1qs"; }; } @@ -611,31 +739,31 @@ name = "system.appcontext"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; - sha256 = "02vsx9l8ahzykjw6psf8yd5grndk63x4rw0lc0rl0s9z203694j3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }; } { name = "system.appcontext"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; - sha256 = "1ipqwwfphj4ndi6krnbali0f3260bmdg0lb9w7w00k3z20gwpjgy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }; } { name = "system.buffers"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; - sha256 = "1x5m2z3x8s4d0z13l8j6jfbaqpwh8dwyg930pcg67gz88zchfhq8"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }; } { name = "system.buffers"; version = "4.4.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }; } @@ -643,271 +771,335 @@ name = "system.buffers"; version = "4.5.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; - sha256 = "0c8qh10lhc8gcl58772i91lc97bljy3dvi6s2r8cjlf0240j5yll"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }; + } + { + name = "system.buffers"; + version = "4.5.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }; } { name = "system.collections"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; - sha256 = "19kjsnpbpznh7qjsyxadw2i8pd4iikrlxwak12l749sli2qd77dj"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }; } { name = "system.collections"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; - sha256 = "0209rky2iyiyqxg0amhmvy6c3fww6pbrq9ffynjnmapizmsvq7ya"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }; } { name = "system.collections.concurrent"; version = "4.0.12"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; - sha256 = "1c4lv39n2i7k146njgk7334izcxjn06cnhmippc1vhwj3bqbzg62"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }; } { name = "system.collections.concurrent"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; - sha256 = "0y6jag332kgkj392mrv7i2a3cgc60ff4hl0nx5qw40hq3w2d9j8z"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }; } { name = "system.collections.immutable"; version = "1.2.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; - sha256 = "1ywivzq43lqlh42qywq6v57yf499dya5rbzk6k7fnkj1121fr7kw"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }; } { name = "system.collections.immutable"; version = "1.5.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; - sha256 = "1yn0g10x5lss68i5n5x9q9z1kbxcbblrwp51ph79cgbi01ga999q"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }; + } + { + name = "system.collections.immutable"; + version = "5.0.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }; } { name = "system.collections.nongeneric"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; - sha256 = "1wj1ddyycsggg3sjq0iflzyj93m7ny8mc2dpzvh5iqy89lj3gx1m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }; + } + { + name = "system.configuration.configurationmanager"; + version = "4.7.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; + sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }; } { name = "system.console"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.console/4.0.0/system.console.4.0.0.nupkg"; - sha256 = "0fw0ap3c0svxjbkgr5yrkck36lbrijhsx48v53xkam5y6m0vh1s3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }; } { name = "system.console"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; - sha256 = "0hyp57lqq986hnj7h017mz1qa1p3qqw3n98nxngdj947ck4mwmpd"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.3.0/system.console.4.3.0.nupkg"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }; } { name = "system.diagnostics.debug"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; - sha256 = "0j4czvcp72qamsj8irwg0sv5lqil4g6q1ghqsm40g5f3380fxcn3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }; } { name = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; - sha256 = "02az3f9n0sy9hpjqq05dkwa4d4bgyrs57b69byya20zydvyxxm9z"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }; } { name = "system.diagnostics.diagnosticsource"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; - sha256 = "0rqi76pqplmk8lzqhwxkkn6ramk56bm66ijg3zki9gzaaqx7fbfk"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }; + } + { + name = "system.diagnostics.fileversioninfo"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.fileversioninfo/4.3.0/system.diagnostics.fileversioninfo.4.3.0.nupkg"; + sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }; } { name = "system.diagnostics.process"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; - sha256 = "1fzm5jrfs4awz0qc2yav1assdnx45j5crpva50a4s0l0dnnvf2jh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }; + } + { + name = "system.diagnostics.stacktrace"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.stacktrace/4.3.0/system.diagnostics.stacktrace.4.3.0.nupkg"; + sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }; } { name = "system.diagnostics.tools"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; - sha256 = "0fmmnsvnjxh4gjw2jjix3f7ndvhdh9h4rb4nbjk285c2rgfp2kyn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }; } { name = "system.diagnostics.tracesource"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; - sha256 = "0dwq0z7p3jpxp4y9x1k3pglrs572xx5dsp4nmnz5v5wr6a1kdc8l"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }; } { name = "system.diagnostics.tracing"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; - sha256 = "0lzdnq31spwv2xd9xkf0ph4zlg7bqifcvp1915jk1hb5fjjf1byp"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }; } { name = "system.diagnostics.tracing"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; - sha256 = "0zwc9qk2ig6h74dnn4hxlyhnfchp6yd6hqv39dy0dhp3xagwfqp3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }; + } + { + name = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }; } { name = "system.globalization"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; - sha256 = "04pycnih66s15rbwss94ylm0svfr276ym4w4w14bb9g56dk0wwyy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }; } { name = "system.globalization"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; - sha256 = "1sydnlnaqmarcfs1cvaa3rpax7qhzd8wd67f74k89lr3k77cagfh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }; } { name = "system.globalization.calendars"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; - sha256 = "1qfa54p7ab2himyry3lf0j85gpz3mx9yj0sy0v2j9i94ndvk1w7c"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }; } { name = "system.io"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; - sha256 = "0drs586wimx7vzwqfdb72k640iz24645cwz053n1f08752bjkzq8"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }; } { name = "system.io"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; - sha256 = "1n3qypsgn18pg13vyjcnchz3zbfajdk6swl1wzf0hv6324v8xyd7"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }; } { name = "system.io.compression"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; - sha256 = "0mxp384amfdapgsf6fkyf3c5q10jc2yy55v3vim8wq1w8aim1qcf"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }; } { name = "system.io.compression.zipfile"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; - sha256 = "08fbnsgbbnfj7d6k5zdqvm3580iqwrq4qzbnyq6iw9g93kmlyh5p"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }; } { name = "system.io.filesystem"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; - sha256 = "0mp3n5214lzxz7qn2y5k7f2y9qv067xa23bnbyyhpmlkbl3grwc6"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }; } { name = "system.io.filesystem"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; - sha256 = "1p4r4n4minxgir17xh7rwv503fj1zgnm1vb24and7v2n6id4ma61"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }; } { name = "system.io.filesystem.primitives"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; - sha256 = "12mspig2fvzhvbdm22yk081lpn7rc45xwwricc5vnaszgjp83gns"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }; } { name = "system.io.filesystem.primitives"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; - sha256 = "0s22vnhy6cxyzicipj3937rldxk1znlykakc6j596mjgsmshpfqn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }; } { name = "system.linq"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg"; - sha256 = "1n404dvsz6p2d18q9k3ip1vyl8ffbsz6xvc2bl2bba9ccpyjhygm"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }; } { name = "system.linq"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; - sha256 = "1419wbklbn2vliwfy77p759k084h8jp9i3559shbhrzfxjr2fcv9"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }; } { name = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; - sha256 = "177cz5hgcbq8lpgvdjmkpsx4kr645wpxhbgh3aw3f28nqlmhl70j"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }; + } + { + name = "system.management"; + version = "4.5.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/4.5.0/system.management.4.5.0.nupkg"; + sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }; } { name = "system.memory"; version = "4.5.3"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; - sha256 = "1igqq2lqrijpbn66w1020cyyqiwy80i9fkqrmalamjmvmyg28p8m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.3/system.memory.4.5.3.nupkg"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }; + } + { + name = "system.memory"; + version = "4.5.4"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }; } { name = "system.net.http"; version = "4.3.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }; } @@ -915,23 +1107,23 @@ name = "system.net.primitives"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; - sha256 = "1zfrz4p3nmz3cnb0i8xwc76175328dfgrlmp3bcwvp5vplv3ncnz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }; } { name = "system.net.sockets"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; - sha256 = "026ghgh25lw953aqd83npk856g4bwi6a8y7jc695qj8lb929yp5s"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }; } { name = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }; } @@ -939,127 +1131,151 @@ name = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; - sha256 = "1r66gjpvbmgr3216ch2fx9zzd08fb78br4hzblvsvi7wfwp6w7ip"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }; } { name = "system.objectmodel"; version = "4.0.12"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; - sha256 = "06abwzrai4k999qmc8bkcvq26px2ws9gk04c01c1ix9fw02pf546"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }; } { name = "system.objectmodel"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; - sha256 = "18mryszf4a66a52v9din5wgqiykp0ficl5zl5l9grkrisjnl7jh4"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }; } { name = "system.private.datacontractserialization"; version = "4.1.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; - sha256 = "1hrbq85s14x7ck6an570z8p7slprlsswxlydz0pdzfmnqwpv0qbi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }; } { name = "system.reflection"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; - sha256 = "003bmllpdf35jsbbhgsi4a24rqprdhgjpi3d76jk7sgllbh6p1wj"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }; } { name = "system.reflection"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; - sha256 = "00f1n6r8z6zw3mfhrfg402s6fj95jj9d8z5s62kfmd7pdsnv39xi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }; } { name = "system.reflection.emit"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; - sha256 = "0s1cpkpnn2x6bicspj1x7z7zlfg1h5iy8mvr5bcq55fgpyf6xin8"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }; + } + { + name = "system.reflection.emit"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }; } { name = "system.reflection.emit.ilgeneration"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; - sha256 = "0q789n72y47jkld2076khan7zz2gm04znpnz0nznin7ykp8aa0ih"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }; } { name = "system.reflection.emit.lightweight"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; - sha256 = "10hsbdar8vzvq3izv3v8a93rz7brnmrcrcl5c0nvy8vlmdk41jlx"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }; + } + { + name = "system.reflection.emit.lightweight"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }; } { name = "system.reflection.extensions"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; - sha256 = "1n1gig2nlycrz1rzy1gi56gcw568ibdpnbknjy7gv9i76aw2kvy7"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }; } { name = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; - sha256 = "020gr3yjb3aa49hm4qyxqrz318ll2rnc8qpcby341ik0gr4ij3wz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }; } { name = "system.reflection.metadata"; version = "1.6.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; - sha256 = "1kw4xsm093zd10jf3vjc2lxmv0zq6chi3g8rka8w0d3l3a5hh3ly"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }; + } + { + name = "system.reflection.metadata"; + version = "5.0.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }; } { name = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; - sha256 = "1r0a1xhlrdr6kdhia9r6rcywds4r8wbk0jagsac6x3rc0kq5f1yi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }; } { name = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; - sha256 = "1b10cxizldqk8niyihhxsabfjkyrlnkgf4im038lbxs3pq7a12yl"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }; } { name = "system.reflection.typeextensions"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; - sha256 = "13y2gvadvzgv5hrizwd53xyciq88p8mpclyqfmikspij4pyb5328"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }; } { name = "system.resources.extensions"; version = "4.6.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; }; } @@ -1067,183 +1283,207 @@ name = "system.resources.reader"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; - sha256 = "0nipl2mayrbgf62mbi3z9crk9hvcrxnry008a33iyk9xy45rmyk1"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; }; } { name = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; - sha256 = "1hjlz6rvr5c7qmvmbv1a338zqjl1dbj0qqidwv9z0ldy4jmg89cy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }; } { name = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; - sha256 = "1bi65kd8fps7gncs053pawc0j44pz4wcgdj3jcw7gpjr4j0zyxwi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }; } { name = "system.runtime"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; - sha256 = "05n73j0s3qgjnp5w2jxaacn93kpq14cldxncv15v04b3lla30mpr"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }; } { name = "system.runtime"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; - sha256 = "0cffdplihjrivvcayzvz32gmv7yissf2pmyaga4fw7g262rf5mxi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }; } { name = "system.runtime.compilerservices.unsafe"; - version = "4.5.2"; + version = "5.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; - sha256 = "0bp6in9qqhprbk85wd0cnfnpjcwdknyyc9rk0891kldx3alnd4h7"; - }; - } - { - name = "system.runtime.compilerservices.unsafe"; - version = "4.7.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }; } { name = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; - sha256 = "0bms87hf2q90kkfg75ljdk09410fl64326wpvhqgfkgw019704yc"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }; } { name = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; - sha256 = "18qn6zjvpngda5bd9nrpphwy5lppmkla86jk5bdapz6ar44ic8wy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }; } { name = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; - sha256 = "00kzqs5d8gm1ppc13idybcdrr07yk2a7f5bdrb0mw7c1bafjp1px"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }; } { name = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; - sha256 = "1klsizwincb42v9yl6m9czgqcmxr7a1h1ri687ldqy4w15718adi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }; } { name = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; - sha256 = "1876kwm4ziikya5s75sb1cp23qwdsd7xhlmlb9gaglibzwkd8b9d"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }; } { name = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; - sha256 = "0l13wfr3y4rq667cyw1rl3bdq24zhs34jwv61piwnv77flwr4brq"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }; } { name = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; - sha256 = "05pmsmrjmy3mk4r8xqihc3w7128d4qccjg6wkyd7zc2yq67w7xmg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }; } { name = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; - sha256 = "131108h1vnayxx6ms2axinja3sqckb1b8z9v8fjnaf9ix8zvmaxq"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }; } { name = "system.runtime.numerics"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; - sha256 = "06i4k2ng909fvlq9dhglgyp0iv5vj6b42vqlsvk2gcn6ssgkq9ya"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }; } { name = "system.runtime.serialization.primitives"; version = "4.1.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; - sha256 = "1mqwgsda61xm2p4chcniypnnrahh8l6j8c9j45jd2r0hmrvnsc4k"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }; } { name = "system.runtime.serialization.xml"; version = "4.1.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; - sha256 = "19mwnihzks4l2q73bsg5ylbawxqcji3slzzp0v46v6xvvrq480wq"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.5.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.7.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }; } { name = "system.security.cryptography.algorithms"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; - sha256 = "04lfa74ll34fk2r42fkdldvcgjp27i3d5zbxx5bxx1dfpsqhkavv"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }; } { name = "system.security.cryptography.encoding"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; - sha256 = "1icdqp1c8f7971h1vkls87m8bdxs7xqg4xs7ygi0x3n56pjbqfpi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }; } { name = "system.security.cryptography.primitives"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; - sha256 = "02dsnjxw9bymk0a2qnnlavpi0jq8832dviblv5f9icmwldridc8y"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }; } { name = "system.security.cryptography.x509certificates"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; - sha256 = "0p02s2k8gcx86ys67ydbgrlnp5q7f073jnlgpliqp4f7d2wiwszd"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }; + } + { + name = "system.security.permissions"; + version = "4.7.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; + sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.5.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }; } { name = "system.security.principal.windows"; version = "4.7.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }; } @@ -1251,47 +1491,55 @@ name = "system.text.encoding"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; - sha256 = "0q829jqhv2sdggb3xjlbdp65g2670w9gw64q2irdzr47gl7zpzyl"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }; } { name = "system.text.encoding"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; - sha256 = "04fsaadvsnjz6jmf88n26md9zcmvwgn2dkwqkjvhf5apph8gi44g"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }; } { name = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; - sha256 = "0ixii299wspn434ccjjv8pcvxww3qjl8257r0dx7myh816v3a9sz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }; + } + { + name = "system.text.encoding.codepages"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.3.0/system.text.encoding.codepages.4.3.0.nupkg"; + sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }; } { name = "system.text.encoding.extensions"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; - sha256 = "15f89w0vwnfp10544wbq0z6fjqn7ig03q3kl16x2pp47rac6yj17"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }; } { name = "system.text.encoding.extensions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; - sha256 = "1w6jxdkrczxwyw2bbs9ng0zi2nk3paznyhm1vnh5vc8v10k96v98"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }; } { name = "system.text.encodings.web"; version = "4.7.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; }; } @@ -1299,7 +1547,7 @@ name = "system.text.json"; version = "4.7.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }; } @@ -1307,191 +1555,223 @@ name = "system.text.regularexpressions"; version = "4.1.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; - sha256 = "1ndgfw99bds4772p7578ylcb4whls76qhiz9a3bh4qy9si48afcv"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }; } { name = "system.text.regularexpressions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; - sha256 = "1510mdlfdc42vyp738wvmqdy3sir2yyh5w3da3v5i0ar2c4jn6wi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }; } { name = "system.threading"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; - sha256 = "12w6vdai88ldgnv9f71rybwyvlzkk1nr57d7f8cz6rajwliz7h6g"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }; } { name = "system.threading"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; - sha256 = "1ad1drl7q1f8fmfaq3r2bswg58nbc2y01mrbhlwkv41ij1ij3fz3"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }; } { name = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; - sha256 = "03gvdi1qk4kyws4sjfl5w3fy9qbrq0d0i72n7a8d59lchm6l9zjk"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }; } { name = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; - sha256 = "0y0gw9q62dchzhk3fcdcdfhk6c5zr0a6rs34qfdbkgksnva10cm1"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }; } { name = "system.threading.tasks.dataflow"; version = "4.9.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; - sha256 = "01lhdmb9w4h82yaqrqpzvz5cv2b228kj332k2h6nz0qycpjd6b0y"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; + sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; }; } { name = "system.threading.tasks.extensions"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; - sha256 = "1dxi845z4cd83v2ph7dq9ykf5gxr6gaw9k29wckv5zhx1rjwprfg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }; } { name = "system.threading.tasks.extensions"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; - sha256 = "1dr14m9c2psrvavv74dzwbi09avn0hxmdvr6z03f96mxkrk3cm1d"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }; } { name = "system.threading.tasks.extensions"; version = "4.5.2"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; - sha256 = "03qkna7pwxaxnxg3ydc1vpjzzrizq55gm7w519gqlmd6yca61vzm"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; + sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }; } { name = "system.threading.tasks.parallel"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg"; - sha256 = "00l76cv7yys3ilrpi32xrs8qk45gmliqvmw2w2zxg3h21y6r0xc0"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.0.1/system.threading.tasks.parallel.4.0.1.nupkg"; + sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75"; + }; + } + { + name = "system.threading.tasks.parallel"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.parallel/4.3.0/system.threading.tasks.parallel.4.3.0.nupkg"; + sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }; } { name = "system.threading.thread"; version = "4.0.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; - sha256 = "0ay1bjmyk0jv6plj9layh3nhr7lnl5a6gzlqi2pgqglb1s9j1x4s"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }; + } + { + name = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }; } { name = "system.threading.timer"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; - sha256 = "0imrcq43k6ii97xpfkwzsvhs6idvgc6mi5c9p7ah828wbaxqh1my"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }; } { name = "system.threading.timer"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; - sha256 = "11p4yxkcn2amlxhwipyia38k8glpam5c9l47y5dvjdicg42dgxl8"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }; } { name = "system.valuetuple"; version = "4.5.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; - sha256 = "068v2h0v8873jh3zc06bxcfzch9frggak1s9csyisl7xzwdijsqn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }; } { name = "system.xml.readerwriter"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; - sha256 = "04ijmcrb40x08br0fdpxmrm0fw2ahpiqjs9wmrqx38ngf96irb7l"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }; } { name = "system.xml.readerwriter"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; - sha256 = "1dsj4s5jwjqix52sizyncvrv5p1h9cdnkh5c4a6407s3gkkh4gzw"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }; } { name = "system.xml.xdocument"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; - sha256 = "14j57hlnmba6rwjwkxx8yp7rk5zf2dzq5j9f22j84jr0xxf00j2f"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }; } { name = "system.xml.xmldocument"; version = "4.0.1"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; - sha256 = "1x2iz1l482876vjr11vsrl895n1bbaflxbj239dpf5a48p06gq7y"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }; + } + { + name = "system.xml.xmldocument"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.3.0/system.xml.xmldocument.4.3.0.nupkg"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }; } { name = "system.xml.xmlserializer"; version = "4.0.11"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; - sha256 = "0987zp4nskf0dbsl3h4s5m1ianjcc398zmp2b98j4834c45jh0bm"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }; } { name = "system.xml.xpath"; version = "4.3.0"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg"; - sha256 = "0hvn82chjynkixvvk9dy9djqvb0hlkbc2hy00gy27vjhd8i4iqkx"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.3.0/system.xml.xpath.4.3.0.nupkg"; + sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; + }; + } + { + name = "system.xml.xpath.xdocument"; + version = "4.3.0"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xdocument/4.3.0/system.xml.xpath.xdocument.4.3.0.nupkg"; + sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }; } { name = "vswhere"; version = "2.6.7"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/vswhere/2.6.7/vswhere.2.6.7.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/vswhere/2.6.7/vswhere.2.6.7.nupkg"; sha256 = "0h4k5i96p7633zzf4xsv7615f9x72rr5qr7b9934ri2y6gshfcwk"; }; } { name = "xlifftasks"; - version = "1.0.0-beta.20206.1"; + version = "1.0.0-beta.20502.2"; src = fetchurl { - url = "https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer/xlifftasks/1.0.0-beta.20206.1/xlifftasks.1.0.0-beta.20206.1.nupkg"; - sha256 = "0xsfzws7rn9sfk4mgkbil21m8d3k3kccfk5f4g6lzvc1vk0pa26j"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20502.2/xlifftasks.1.0.0-beta.20502.2.nupkg"; + sha256 = "17k3dagcxhblzjbh00jsvc150rn7xqp3s3fw2qp1pyjj204y8a90"; }; } { name = "xunit"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit/2.4.1/xunit.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit/2.4.1/xunit.2.4.1.nupkg"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }; } @@ -1499,7 +1779,7 @@ name = "xunit.abstractions"; version = "2.0.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.abstractions/2.0.3/xunit.abstractions.2.0.3.nupkg"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }; } @@ -1507,7 +1787,7 @@ name = "xunit.analyzers"; version = "0.10.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.analyzers/0.10.0/xunit.analyzers.0.10.0.nupkg"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }; } @@ -1515,7 +1795,7 @@ name = "xunit.assert"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.assert/2.4.1/xunit.assert.2.4.1.nupkg"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }; } @@ -1523,7 +1803,7 @@ name = "xunit.core"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.core/2.4.1/xunit.core.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.core/2.4.1/xunit.core.2.4.1.nupkg"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }; } @@ -1531,7 +1811,7 @@ name = "xunit.extensibility.core"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.core/2.4.1/xunit.extensibility.core.2.4.1.nupkg"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }; } @@ -1539,7 +1819,7 @@ name = "xunit.extensibility.execution"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.extensibility.execution/2.4.1/xunit.extensibility.execution.2.4.1.nupkg"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }; } @@ -1547,16 +1827,16 @@ name = "xunit.runner.console"; version = "2.4.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.runner.console/2.4.1/xunit.runner.console.2.4.1.nupkg"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.console/2.4.1/xunit.runner.console.2.4.1.nupkg"; sha256 = "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13"; }; } { name = "xunit.runner.visualstudio"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/xunit.runner.visualstudio/2.4.1/xunit.runner.visualstudio.2.4.1.nupkg"; - sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/xunit.runner.visualstudio/2.4.3/xunit.runner.visualstudio.2.4.3.nupkg"; + sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }; } ] diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 3b98a7a777..a9fbdb09d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.32.0"; + version = "3.32.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-wgIqsOqdwnKL1mWD1CR1ru2erc9iSZoDXxeOtobeAQQ="; + sha256 = "sha256-bwxxjpIBVzFfjewUwDjFNN9zcaL3ihYjWOlWdrhf1o0="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 46ee41d37d..0f36f8dc02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -16,9 +16,7 @@ buildGoModule rec { sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI="; }; - preBuild = '' - buildFlagsArray+=( "-tags" "${lib.optionalString (!enableUnfree) "oss nolimit"}" ) - ''; + tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; meta = with lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index 7ac81b236d..8fe044e41c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.15.0"; + version = "0.15.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1DUGp+HiiY03fyZ+b8hNUBIfuQV5Z/gEcOxc/vG3YiA="; + sha256 = "sha256-ftzV5babf3/l59CWDzVgUF2qws5yo1qEuepFLYd8psA="; }; - cargoSha256 = "sha256-twFXA8A+vP1n6IFJO78fKNs+FC2ui46rj1JmJ/eq3wc="; + cargoSha256 = "sha256-ayCCNE44cOpbrk3FFtW2ZPZ1fTwzXwq3srmptI629sw="; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 85d311d7ae..f8817ffe37 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.18"; + version = "0.12.19"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U="; + sha256 = "sha256-keYKYSWQOiO3d38qrMicYWRZ0jpkzhdZhqOr5JcbA4M="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix index 56d5161b49..a87b20402d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.13.1"; + version = "1.14.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; + sha256 = "sha256-U/UV5NZXmycDp8+g5XV6P2b+4SutR51rVHdPp9HdPjM="; }; - vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; + vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s="; buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix index 52b233817a..0fcbda6966 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix @@ -10,20 +10,19 @@ buildGoModule rec { rev = "v${version}"; hash = "sha256-3mvGHAPKDUmrQkBKwlxnF6PG0ZpZDqlM9SMkCyC5ytE="; }; - vendorSha256 = null; subPackages = [ "cmd/crane" "cmd/gcrane" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/google/go-containerregistry/cmd/crane/cmd.Version=${version} -X github.com/google/go-containerregistry/pkg/v1/remote/transport.Version=${version}" - ]; + ldflags = + let t = "github.com/google/go-containerregistry"; in + [ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ]; # NOTE: no tests doCheck = false; meta = with lib; { - description = "A tool for interacting with remote images and registries"; + description = "Tools for interacting with remote images and registries including crane and gcrane"; homepage = "https://github.com/google/go-containerregistry"; license = licenses.apsl20; maintainers = with maintainers; [ yurrriq ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index b463ecd5de..72dabc3b93 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM="; + sha256 = "sha256-E/6Qh8hWilaGeSojOCz8PzP9qnVqNG2DQLYJUqN3BdY="; }; vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index 2ad3bcbf9a..f531e87e81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.21.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg="; + sha256 = "sha256-fKekn930nOGYUhkQus9p4sKcsuUks+KfO4+X5C/3nWg="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs="; + vendorSha256 = "sha256-yPRtqJTmYDqzwHyBmVV4HxOmMe7FuSZ/lsQj8PInhFg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index 88bc30943c..e667238b9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -13,6 +13,11 @@ buildGoModule rec { sha256 = "sha256-pjg52ONseKNw06EOBzD6Elge+Cz+C3llPvjJPHkn1cw="; }; + patches = [ + # fix kernel module path used by kind + ./kernel-module-path.patch + ]; + vendorSha256 = "sha256-HiVdekSZrC/RkMSvcwm1mv6AE4bA5kayUsMdVCbckiE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/kernel-module-path.patch b/third_party/nixpkgs/pkgs/development/tools/kind/kernel-module-path.patch new file mode 100644 index 0000000000..833cd3388e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/kind/kernel-module-path.patch @@ -0,0 +1,47 @@ +diff --git a/pkg/cluster/internal/providers/common/getmodules.go b/pkg/cluster/internal/providers/common/getmodules.go +new file mode 100644 +index 00000000..f42a883d +--- /dev/null ++++ b/pkg/cluster/internal/providers/common/getmodules.go +@@ -0,0 +1,15 @@ ++package common ++ ++import "os" ++ ++const ( ++ fhsKernalModulePath = "/lib/modules" ++ nixKernalModulePath = "/run/booted-system/kernel-modules/lib" ++) ++ ++func GetKernelModulePath() string { ++ if _, err := os.Stat(nixKernalModulePath); !os.IsNotExist(err) { ++ return nixKernalModulePath ++ } ++ return fhsKernalModulePath ++} +diff --git a/pkg/cluster/internal/providers/docker/provision.go b/pkg/cluster/internal/providers/docker/provision.go +index 50161861..86d5b7b6 100644 +--- a/pkg/cluster/internal/providers/docker/provision.go ++++ b/pkg/cluster/internal/providers/docker/provision.go +@@ -242,7 +242,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n + // (please don't depend on doing this though!) + "--volume", "/var", + // some k8s things want to read /lib/modules +- "--volume", "/lib/modules:/lib/modules:ro", ++ "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + }, + args..., + ) +diff --git a/pkg/cluster/internal/providers/podman/provision.go b/pkg/cluster/internal/providers/podman/provision.go +index 51dce486..3bc36b42 100644 +--- a/pkg/cluster/internal/providers/podman/provision.go ++++ b/pkg/cluster/internal/providers/podman/provision.go +@@ -205,7 +205,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n + // dev: devices on the volume will be able to be used by processes within the container + "--volume", fmt.Sprintf("%s:/var:suid,exec,dev", varVolume), + // some k8s things want to read /lib/modules +- "--volume", "/lib/modules:/lib/modules:ro", ++ "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + }, + args..., + ) diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix index fde540b057..9a6b16fd43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.42.0"; + version = "0.42.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-MrIn+siqBnjwst4HKdJQ+iy1PxCldKizXkmqHH6D3Kg="; + sha256 = "sha256-ASQuMWH6stUupJkfOpzVMs+c+xq7OWbVxGh6IY2zd70="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 2d5e77f791..13badd48e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15149"; + version = "0.1.15663"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw="; + sha256 = "sha256-r5528iMy3RRSSRbTOTilnF1FkWBr5VOUWvAZQU/OBjc="; }; - vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s="; + vendorSha256 = "sha256-VOPXM062CZ6a6CJGzYTHav1OkyiH7XUHXWrRdGekaGQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix index 84890f1662..cfd2ed81e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7r"; + version = "4.7s"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "sha256-bgRg2yVZXHobUz8AUaV4ZKBkp2KjP+2oXbDXmPTUX8U="; + sha256 = "sha256-TGpZNahykQjRcUhgmwgDRQ/OFRWFiW+7gXhfHGEYQrg="; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 156e3f7f89..ccae937702 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,31 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: +{ stdenv +, lib +, fetchFromGitHub +, go-md2man +, installShellFiles +, libusb-compat-0_1 +}: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; - version = "2.1.20191110"; + version = "2.1+unstable=2021-04-10"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; - rev = "e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592"; - sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; + rev = "9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d"; + sha256 = "lQ1XtaWPr6nvE8NArD1980QVOH6NggO3FlfsntUjY7s="; }; - buildInputs = [ libusb-compat-0_1 ]; + nativeBuildInputs = [ + go-md2man + installShellFiles + ]; - nativeBuildInputs = [ go-md2man installShellFiles ]; + buildInputs = [ + libusb-compat-0_1 + ]; installPhase = '' + runHook preInstall + install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli install -Dm444 -t $out/share/doc/${pname} *.md *.txt go-md2man -in README.md -out ${pname}.1 installManPage *.1 + + runHook postInstall ''; meta = with lib; { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 402d64c9b6..25ced7b95f 100755 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -20,6 +20,7 @@ mapfile -t repos < <( msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ -p:RestoreNoCache=true -p:RestoreForce=true \ + -p:NuGetPackageVersion=5.9.1-rc.8 \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 cd "$tmpdir" diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 7cf36fd1f8..da15f47b6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -77,10 +77,16 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper msbuild ]; + # NuGetPackageVersion is overridden to be to be compatible with msbuild 16.10, + # it needs to be kept in sync with ./create-deps.sh buildPhase = '' runHook preBuild - HOME=$(pwd)/fake-home msbuild -r -p:Configuration=Release -p:RestoreConfigFile=${nuget-config} src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj + HOME=$(pwd)/fake-home msbuild -r \ + -p:Configuration=Release \ + -p:RestoreConfigFile=${nuget-config} \ + -p:NuGetPackageVersion=5.9.1-rc.8 \ + src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj runHook postBuild ''; @@ -97,7 +103,7 @@ in stdenv.mkDerivation rec { ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ - --prefix PATH : ${dotnet-sdk}/bin \ + --suffix PATH : ${dotnet-sdk}/bin \ --add-flags "$out/src/OmniSharp.exe" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix index b64d5894da..e90424dd78 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -707,8 +707,8 @@ name = "microsoft.visualstudio.debugger.contracts"; version = "17.2.0-beta.21262.1"; src = fetchurl { - url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg"; - sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg"; + sha256 = "148gb4k28fch1rhh6kr82dajl7qnvjxvkxvc8igy7zra70nvbx74"; }; } { @@ -839,6 +839,14 @@ sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; }; } + { + name = "nuget.common"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/5.9.1-rc.8/nuget.common.5.9.1-rc.8.nupkg"; + sha256 = "056b1h4fvik6z2qc2s6qzz0s4acbipc50af14fbr7hd9h2fxya4c"; + }; + } { name = "nuget.configuration"; version = "5.2.0"; @@ -847,6 +855,14 @@ sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; }; } + { + name = "nuget.configuration"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/5.9.1-rc.8/nuget.configuration.5.9.1-rc.8.nupkg"; + sha256 = "0x8vigf0sfp6kf1i98xcr4k84vci596x16hmajdm0zgv3p1w2kvk"; + }; + } { name = "nuget.dependencyresolver.core"; version = "5.2.0"; @@ -855,6 +871,14 @@ sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }; } + { + name = "nuget.dependencyresolver.core"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/5.9.1-rc.8/nuget.dependencyresolver.core.5.9.1-rc.8.nupkg"; + sha256 = "1q9a97s1z3a6fb4p82ag2lqnzl53895prbqwlbvckdw9c3rpz3gc"; + }; + } { name = "nuget.frameworks"; version = "5.0.0"; @@ -871,6 +895,14 @@ sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; }; } + { + name = "nuget.frameworks"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/5.9.1-rc.8/nuget.frameworks.5.9.1-rc.8.nupkg"; + sha256 = "1n3mp9ns79yq4dwgj7h2av3b485mzgsw0qlj8z7p47krwlzp5hiv"; + }; + } { name = "nuget.librarymodel"; version = "5.2.0"; @@ -879,6 +911,14 @@ sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; }; } + { + name = "nuget.librarymodel"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/5.9.1-rc.8/nuget.librarymodel.5.9.1-rc.8.nupkg"; + sha256 = "0sy8422c94wcg8ka85lnawq26mpixl79avk9m6y44lshrpga5v4v"; + }; + } { name = "nuget.packaging"; version = "5.2.0"; @@ -888,11 +928,19 @@ }; } { - name = "nuget.packaging.core"; - version = "5.2.0"; + name = "nuget.packaging"; + version = "5.9.1-rc.8"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.2.0/nuget.packaging.core.5.2.0.nupkg"; - sha256 = "16sm2amzvbpmisb6x6dz1pvj1h3xm67vd2byl1wl13vrda0az3xb"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/5.9.1-rc.8/nuget.packaging.5.9.1-rc.8.nupkg"; + sha256 = "0x9c3v741nn6m2xgidna88fa4xj5avhv6asj73hqv4pzpdprlrhv"; + }; + } + { + name = "nuget.packaging.core"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/5.9.1-rc.8/nuget.packaging.core.5.9.1-rc.8.nupkg"; + sha256 = "0vsaixmla4zh277xpn5ngbmi2f52hb26aqzr0z9l4a3mlpi4l5nx"; }; } { @@ -903,6 +951,14 @@ sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; }; } + { + name = "nuget.projectmodel"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/5.9.1-rc.8/nuget.projectmodel.5.9.1-rc.8.nupkg"; + sha256 = "1xjh7isw467nkc7dkfj3wlw69vi2cns66z152jrzjdmxmia3i3pv"; + }; + } { name = "nuget.protocol"; version = "5.2.0"; @@ -911,6 +967,14 @@ sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; }; } + { + name = "nuget.protocol"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/5.9.1-rc.8/nuget.protocol.5.9.1-rc.8.nupkg"; + sha256 = "1rnrxzaciqhhgwd4by0dhkvfrm1h161vvmkvlcwaz2589sqq2dzq"; + }; + } { name = "nuget.versioning"; version = "5.2.0"; @@ -919,6 +983,14 @@ sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }; } + { + name = "nuget.versioning"; + version = "5.9.1-rc.8"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/5.9.1-rc.8/nuget.versioning.5.9.1-rc.8.nupkg"; + sha256 = "1vv7z122ilsk2rsvjm6j3hpifb45g8wa1mgnq1kwi9k8b2dbb6vv"; + }; + } { name = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; @@ -1319,14 +1391,6 @@ sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }; } - { - name = "system.diagnostics.process"; - version = "4.3.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; - sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; - }; - } { name = "system.diagnostics.tools"; version = "4.3.0"; @@ -1343,14 +1407,6 @@ sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }; } - { - name = "system.dynamic.runtime"; - version = "4.3.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }; - } { name = "system.globalization"; version = "4.0.11"; @@ -1887,6 +1943,14 @@ sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }; } + { + name = "system.security.cryptography.cng"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg"; + sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; + }; + } { name = "system.security.cryptography.csp"; version = "4.3.0"; @@ -1919,6 +1983,14 @@ sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm"; }; } + { + name = "system.security.cryptography.pkcs"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/5.0.0/system.security.cryptography.pkcs.5.0.0.nupkg"; + sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; + }; + } { name = "system.security.cryptography.primitives"; version = "4.3.0"; @@ -1929,10 +2001,10 @@ } { name = "system.security.cryptography.protecteddata"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; - sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg"; + sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }; } { @@ -2151,22 +2223,6 @@ sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }; } - { - name = "system.threading.thread"; - version = "4.3.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; - sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; - }; - } - { - name = "system.threading.threadpool"; - version = "4.3.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }; - } { name = "system.threading.timer"; version = "4.3.0"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 2671e4148b..10c551c144 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -3,10 +3,12 @@ tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json)); + tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); + tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); tree-sitter-fluent = (builtins.fromJSON (builtins.readFile ./tree-sitter-fluent.json)); tree-sitter-go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); tree-sitter-haskell = (builtins.fromJSON (builtins.readFile ./tree-sitter-haskell.json)); diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json new file mode 100644 index 0000000000..54e275adf6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/stsewd/tree-sitter-comment", + "rev": "894b61d68a31d93c33ed48dcc7f427174b440abe", + "date": "2021-04-27T15:25:48-05:00", + "path": "/nix/store/w0yz9imzi33glwk6ilm0jqipcyzl8hgm-tree-sitter-comment", + "sha256": "1vfayzzcv6lj63pgcxr8f7rcd81jkgnfdlmhs39i7w3m0s6dv1qg", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json new file mode 100644 index 0000000000..4dc81284db --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/ram02z/tree-sitter-fish", + "rev": "db7139393e50765520618fa469f41dfbb0b3822b", + "date": "2021-07-06T21:05:19+02:00", + "path": "/nix/store/k67b4bn67zd3dj9yg0q7jywy3vnkv8gw-tree-sitter-fish", + "sha256": "09l5myivlq3z53nqlx8x8c45sww2k7vmjp8z0rvwzv08rnym0fah", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 55237b298d..308ca3eeb6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -70,6 +70,10 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-comment" = { + orga = "stsewd"; + repo = "tree-sitter-comment"; + }; "tree-sitter-nix" = { orga = "cstrahan"; repo = "tree-sitter-nix"; @@ -106,6 +110,10 @@ let orga = "GrayJack"; repo = "tree-sitter-zig"; }; + "tree-sitter-fish" = { + orga = "ram02z"; + repo = "tree-sitter-fish"; + }; }; allGrammars = diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index 641c1581b0..b828dbfc71 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -6,8 +6,8 @@ let ## fetchgit info url = "git://sourceware.org/git/systemtap.git"; rev = "release-${version}"; - sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; - version = "4.1"; + sha256 = "sha256-3LgqMBCnUG2UmsekaIvV43lBpSPEocEXmFV9WpE7wE0="; + version = "4.5"; inherit (kernel) stdenv; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh index a67b6c927a..893477735f 100755 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -51,6 +51,9 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ >"$build_deps/package.json.new" +# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195 +sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new" + if cmp --quiet "$build_deps"/package.json{.new,}; then echo "package.json not changed, skip updating nodePackages" rm "$build_deps"/package.json.new diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 86ab951bb9..6d299ce6ec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf"; + sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9"; }; - cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj"; + cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix index 5499a937b2..baff8affcb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchurl, unzip }: let - version = "3.5.15"; + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "3.5.37"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "sha256-JrDAF/3yPGJXwonWIvaKf0dw4GQf3U2wbf5iF4QUXco="; + sha256 = "sha256-Vxmhl4/bhRDeByGgkdSF8yEY5wI23WzT2iH1OFkEpck="; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "sha256-fgVVJ+J4w+Z3Kmryixp844xlLFiRs5PSAcD/wrcXF1w="; + sha256 = "sha256-pttjlx7WWE3nog9L1APp8HN+a4ShhlBj5irHOaPgqHw="; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix index 1868bdaf2c..10012e552c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.10"; + version = "1.22.11"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0pdimll8lhsnqfafhdaxd6h6mgxhj1c7h56r111cmxhzw462y3mr"; + sha256 = "0gmk46b9gd6q0zi3a2adgf8c1y05c2lf34k5wrw7alnlwy8iqvvp"; }; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index f00c080cd1..0c758d934a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.6.3"; + version = "4.11.2"; src = fetchFromGitHub { owner = "mikefarah"; - rev = "v${version}"; repo = "yq"; - sha256 = "sha256-+qSGdskv8qUZRl7wYKn8WsgAcD8DYw1BwZnVKK6g/sI="; + rev = "v${version}"; + sha256 = "sha256-IzsI0jS+chm/xOdL1O11qxQTstKcUeZ9YxL7RtKHBZw="; }; - vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw="; + vendorSha256 = "sha256-X162NQ+NgOUbwEA6xdnuy0u18/GQLhR3zzi+TVgzMIc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/kore/default.nix b/third_party/nixpkgs/pkgs/development/web/kore/default.nix index bc8113fc6a..a1bd3ecd45 100644 --- a/third_party/nixpkgs/pkgs/development/web/kore/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "0186lih30zps2d4600ikafbgsml269jzpcszdggzzkdw8p628qw9"; + sha256 = "sha256-w5H1USQ2aladwSFdfYsX925pjCt3QWoXK4HqyEL7rH0="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index 8e3fd36b73..13b1e7b95c 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-ZvvBNDF9sjcO4JnLPRkzC1B1YG3fcMyjM9qwFlAg9sE="; + sha256 = "sha256-OVNCspdOM1BWDmV1LTaqtlc2UrEcxste95ouXoOtZLE="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/alephone/marathon/default.nix b/third_party/nixpkgs/pkgs/games/alephone/marathon/default.nix index 4518215a33..e30a29695a 100644 --- a/third_party/nixpkgs/pkgs/games/alephone/marathon/default.nix +++ b/third_party/nixpkgs/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,12 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { - url = - "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; + url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; + sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/games/angband/default.nix b/third_party/nixpkgs/pkgs/games/angband/default.nix index e14629dce8..ed18624deb 100644 --- a/third_party/nixpkgs/pkgs/games/angband/default.nix +++ b/third_party/nixpkgs/pkgs/games/angband/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-z1HTt3+lWIr2F9YZFdw47lkYVgYl17qbb/OJ9YyYQa8="; + sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "bindir=$(out)/bin" ]; meta = with lib; { - homepage = "http://rephial.org/"; + homepage = "https://angband.github.io/angband"; description = "A single-player roguelike dungeon exploration game"; maintainers = [ maintainers.chattered ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 26b29b9228..a3867c9390 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.44"; + version = "2.1.46"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "01d5ll3vsd4v0ikxgamv47bkwmag15vnmsgpda5wivc3dyawc9j9"; + sha256 = "1jzpf42fqhfbjr95k7bpsnf34sfinamp6v828y0sapa4gzfvwkkz"; }; installPhase = '' @@ -57,7 +57,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "1zrdih4rjsq30480sf200pw59r42p3nq2md56kj2l641kbc7ljka"; + sha256 = "003cmh5qdj5mkrpm51n0is872faj99dqfkaaxyyrn6x03s36l17y"; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/games/ballerburg/default.nix b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix new file mode 100644 index 0000000000..ceb95059ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/ballerburg/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, cmake, SDL }: + +stdenv.mkDerivation rec { + pname = "ballerburg"; + version = "1.2.0"; + + src = fetchurl { + url = "https://download.tuxfamily.org/baller/ballerburg-${version}.tar.gz"; + sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ SDL ]; + + meta = with lib; { + description = "Classic cannon combat game"; + longDescription = '' + Two castles, separated by a mountain, try to defeat each other with their cannonballs, + either by killing the opponent's king or by weakening the opponent enough so that the king capitulates.''; + homepage = "https://baller.tuxfamily.org/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.j0hax ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/dhewm3/default.nix b/third_party/nixpkgs/pkgs/games/dhewm3/default.nix index b5caa603ea..a87236c48f 100644 --- a/third_party/nixpkgs/pkgs/games/dhewm3/default.nix +++ b/third_party/nixpkgs/pkgs/games/dhewm3/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis -, openal, curl }: +, openal, curl, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "dhewm3"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; rev = version; - sha256 = "0wsabvh1x4g12xmhzs2m2pgri2q9sir1w3m2r7fpy6kzxp32hqdk"; + sha256 = "sha256-QI2INtNP+TSXdGSNxBcJ+lQK9dvDStrir20z3kCY8v4="; }; # Add libGLU libGL linking @@ -21,9 +21,18 @@ stdenv.mkDerivation rec { cd "$(ls -d dhewm3-*.src)"/neo ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake copyDesktopItems ]; buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; + desktopItems = [ + (makeDesktopItem { + name = "dhewm3"; + exec = "dhewm3"; + desktopName = "Doom 3"; + categories = "Game;"; + }) + ]; + hardeningDisable = [ "format" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index ea154db121..fabfdeea8c 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs="; + sha256 = "sha256-zm7yR87pJY26USHocT7HnPNQK5xYjFPNo4RT2Lr3C/k="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index 27731a3a00..051266fa80 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -7,17 +7,14 @@ , enableSqlite ? true, sqlite }: -let - inherit (lib) optional optionals; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "freeciv"; version = "2.6.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; - rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE="; }; @@ -29,43 +26,39 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optional qtClient [ qt5.wrapQtAppsHook ]; + ++ lib.optional qtClient [ qt5.wrapQtAppsHook ]; buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ] - ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] - ++ optionals gtkClient [ gtk3 ] - ++ optionals qtClient [ qt5.qtbase ] - ++ optional server readline - ++ optional enableSqlite sqlite; + ++ lib.optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] + ++ lib.optionals gtkClient [ gtk3 ] + ++ lib.optionals qtClient [ qt5.qtbase ] + ++ lib.optional server readline + ++ lib.optional enableSqlite sqlite; dontWrapQtApps = true; configureFlags = [ "--enable-shared" ] - ++ optional sdlClient "--enable-client=sdl" - ++ optionals qtClient [ + ++ lib.optional sdlClient "--enable-client=sdl" + ++ lib.optionals qtClient [ "--enable-client=qt" "--with-qt5-includes=${qt5.qtbase.dev}/include" - ] - ++ optionals gtkClient [ "--enable-client=gtk3.22" ] - ++ optional enableSqlite "--enable-fcdb=sqlite3" - ++ optional (!gtkClient) "--enable-fcmp=cli" - ++ optional (!server) "--disable-server"; + ] ++ lib.optionals gtkClient [ "--enable-client=gtk3.22" ] + ++ lib.optional enableSqlite "--enable-fcdb=sqlite3" + ++ lib.optional (!gtkClient) "--enable-fcmp=cli" + ++ lib.optional (!server) "--disable-server"; enableParallelBuilding = true; meta = with lib; { description = "Multiplayer (or single player), turn-based strategy game"; - longDescription = '' Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the stone age to the space age... ''; - homepage = "http://www.freeciv.org"; # http only license = licenses.gpl2; - maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; hydraPlatforms = platforms.linux; # sdl-config times out on darwin diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix index 586d93151e..35a55ba307 100644 --- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.40.14"; + version = "3.60.14"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; - rev = "v${version}"; - sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd"; + rev = "8a86aa31444f6afa97e4ab4cc2c651b1243b8349"; + sha256 = "sha256-2+zG0O5ZW3rA4c83HXWsQ/V72KwHgrynDH0i3rLBWwU="; }; nativeBuildInputs = [ @@ -53,9 +53,6 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace requirements.txt \ - --replace "PyGObject-stubs" "" - substituteInPlace src/grapejuice_common/assets/desktop/grapejuice.desktop \ --replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \ --replace \$GRAPEJUICE_ICON grapejuice diff --git a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix index 8ab54468c0..787184273f 100644 --- a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 -, game-music-emu, pkg-config }: +, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: let zmusic-src = fetchFromGitHub { @@ -38,7 +38,7 @@ let fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; buildInputs = [ SDL2 libGL @@ -55,7 +55,18 @@ let NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = "Game;"; + }) + ]; + installPhase = '' + runHook preInstall + install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" for i in *.pk3; do install -Dm644 "$i" "$out/lib/gzdoom/$i" @@ -68,6 +79,8 @@ let done mkdir $out/bin makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/manaplus/default.nix b/third_party/nixpkgs/pkgs/games/manaplus/default.nix index ff7bfae971..09edb32ad1 100644 --- a/third_party/nixpkgs/pkgs/games/manaplus/default.nix +++ b/third_party/nixpkgs/pkgs/games/manaplus/default.nix @@ -3,11 +3,11 @@ , libGL, autoreconfHook }: stdenv.mkDerivation rec { pname = "manaplus"; - version = "1.9.3.23"; + version = "2.1.3.17"; src = fetchurl { url = "https://download.evolonline.org/manaplus/download/${version}/manaplus-${version}.tar.xz"; - sha256 = "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz"; + sha256 = "sha256-6NFqxUjEAp7aiIScyTOFh2tT7PfuTCKH1vTgPpTm+j0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix index e67506c10a..2304acf446 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.17"; + version = "1.17.1"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar"; + url = "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar"; # sha1 because that comes from mojang via api - sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"; + sha1 = "a16d67e5807f57fc4e550299cf20226194497dc2"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix index 41589caed6..87ecd46013 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "quakespasm"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/Quake"; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ gzip SDL libvorbis libmad ]; @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + desktopItems = [ + (makeDesktopItem { + name = "quakespasm"; + exec = "quake"; + desktopName = "Quakespasm"; + categories = "Game;"; + }) + ]; + meta = with lib; { description = "An engine for iD software's Quake"; homepage = "http://quakespasm.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix index 44e35c3787..602bdb1ee3 100644 --- a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix +++ b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-LRTHnYxjPraVISAERT6XJGKIA3YJIilgEwU6olq2CRc="; + sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw="; }; - cargoSha256 = "sha256-ZlQy/JiYKDKPCEWrAFvKV6WsAkk2zsPpfJADB+kPyuo="; + cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix index bdb2839ab0..9c4998ecaa 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "epson-escpr"; - version = "1.7.3"; + version = "1.7.16"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" ]; - sha256 = "0r3jkdfk33irha9gpyvhha056ans59p7dq9i153i292ifjsd8458"; + sha256 = "18n6fgyrii8084vdjhys94lr6nhhbmn7zzjd8jckvv1grb0iz9nv"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix index 3426b47dae..35e28ba55f 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/fuse-emulator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "fuse-emulator"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/fuse-${version}.tar.gz"; - sha256 = "0kaynjr28w42n3iha60mgr7nxm49w8j0v49plyrc7ka24qzmiqph"; + sha256 = "sha256-Oo/t8v/pR8VxVhusVaWa2tTFkzj3TkSbfnpn2coEcJY="; }; nativeBuildInputs = [ perl pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index 6accb486d5..7e278684ce 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -44,16 +44,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.13"; + version = "6.14"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-4DohoBHUXSrp8iIED7dpC5cVY3bnQx+GHyAHPq8k8oo="; + sha256 = "sha256-ZLRxk5lDvAjjUQJ9tvvCRlwTllCjv/65Flf/DujCUgI="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "6.2.0"; + version = "6.3.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-zY1TUT2DV7KHama6sIllTvmUH0LvaQ+1VcZJP1OB28o="; + sha256 = "sha256-pfAtMqAoNpKkpiX1Qc+7tFGIMShHTFyANiOFMXzQmfA="; }; patches = [ @@ -65,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-3IpO+eQ/+DiQZH6en5Q/p+j441LDvjn4i9Ex7PY8KCk="; + sha256 = "sha256-yzpRWNx/e3BDCh1dyf8VdjLgvu6yZ/CXre/cb1roaVs="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index d55d2ed060..be5a660f3c 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,11 +77,11 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-06"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "10f984673c51d2affbf8dc69d79a6280d7b69060"; + rev = "cc34310a99ece2a1bb8d626f77436e53d43fa18b"; sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; @@ -281,12 +281,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-08-06"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "fbe62f62bbe16c871073868fe29d7ffdd3d1251e"; - sha256 = "14hzbpgkalia7j42zr0gnddbh2rnxv149xvlzl39wkzjk7gxjz0y"; + rev = "877ef78049d44eee8ebf4d0e6ec541ca23e4ab49"; + sha256 = "0m4yn8kkljn6m45ha7279wv7p9ppjyqrrpagmq92yrqnbfi87qa1"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-06"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7db60eee751787035a3f152040fdf6b48104453e"; - sha256 = "08hqx031gd8sd7lvzx4n429311p3nihhp1k1knsq3yn8yfrj915m"; + rev = "455cf79d081afec70973819160edf3bcf3c6fd85"; + sha256 = "1kbda51padbi6qgykzwr1rf081p3154rs6zy7gzpzlhi9k61jqnh"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1340,12 +1340,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-08-04"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "40fc9b306d45921a6b5bd649566d218a41cb04da"; - sha256 = "08bbb1syhdfspdh5303gkf524jr90vkfcx759wv9khz1k9cz975c"; + rev = "83f3478dee644b4be534ada9456e915cbb4f37be"; + sha256 = "0s53h7dfyv05z0w186957scrdxihmk6s8db29d4iq7d81hsxckxg"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1364,12 +1364,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-06-04"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "869f70a7603b77cdb2f63983dd286f3f61b7a966"; - sha256 = "031c000nr2raw0v6bdnisczjz20y5iw0yapj8wih0nc703dirhih"; + rev = "074a6b34952f2d14be196c217a3995749670f627"; + sha256 = "0vvz81dg64pp0x08imcicrqkp4z90ahfxsikhswraslklc1k1ar1"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1388,12 +1388,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-29"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "d80cb807ab6101567862e99568c13a7b6093f2f7"; - sha256 = "031lrwzipamm1sbr7kjmisfya35p2magvaq5i919ncnjpvfcmgws"; + rev = "14a4681737cf2ac33ff479cebd42398bbe2a68f0"; + sha256 = "0d8cps2sb3p40kwx534430r1yy2mdgvl5vls4wbzw9i71miqnvxk"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1558,12 +1558,12 @@ final: prev: ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2021-07-09"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "14d883975b2f1d50bbf7a6f74a04f39e59c0b06c"; - sha256 = "1hnn3x37iphbaam3h5kz0l6y09v2xr79p1nkhs10m939vxavg62k"; + rev = "a513036f28d9ef1092d95ba7f183b3966a070194"; + sha256 = "117ifszvd2f6h86ialqnm10j14bhhcyn4pjl0289zsyf2fk4kksn"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -1667,12 +1667,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "bf2ebdfba23a10a7b9dea62b23dfaa7a1bc0852d"; - sha256 = "100iif4is145fgr3hzqk4k9d3jhdl3lh6nbl4n7xrahkh9fxw6s8"; + rev = "cafecca6f3586b2ccb3c6b4db2082662f36e8c7f"; + sha256 = "0dsl4ccwnlv2i1pmmjlrxw0ns2amrv1vn8khm1c52hl3377j3dwq"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1869,14 +1869,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; + gitlinker-nvim = buildVimPluginFrom2Nix { + pname = "gitlinker-nvim"; + version = "2021-07-15"; + src = fetchFromGitHub { + owner = "ruifm"; + repo = "gitlinker.nvim"; + rev = "585f2eab74cb872c421f564274ef050fa74937ab"; + sha256 = "1zc9yr7b53akn639xhczala7vqz7rdy61xnndwn37bdxzvjqm59j"; + }; + meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; + }; + gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-05"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "8d284060170bcc96987b3c431a7c8fa3aef9e1cc"; - sha256 = "1x2pwb8d8azfmpfpyhx9anfh6ji2viwi98zfgqp12q7bq9rvf9h3"; + rev = "dd58b795a4863871fe2378dc17c6821e15b0eb59"; + sha256 = "1s33j8xbh4y8hiw7d0msr77h79zqrdcxfnmnf2lkqbh6jzqfyyqf"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2003,12 +2015,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-07-29"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "7a1d276a3d938d488d2d592fbb52ecec642268fc"; - sha256 = "1pvdlci25qr122gzrb661bpl62sfz81vxsbyzwwnf16b18qsxi5r"; + rev = "d66186aacb6b8fef03832fd149a941a21111049a"; + sha256 = "0dsdbrgqyh0h3kfxkrwh4hqa883r08wkijpdy1dk5wl76b4if2cp"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2472,12 +2484,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-21"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99"; - sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8"; + rev = "b1ebb53902a4f5d8c565f7485d4e57d937f89b91"; + sha256 = "1fjzrrr0i0yvl2q65r1v922iza13zy8chfcz998hi499sizviwmq"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2712,12 +2724,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-05"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "04126aa17cbe863a4fe8ca43653cd9ef70f29c18"; - sha256 = "0w2jxbbmgdlh9hakzjy2i229qlcj7krh1xb7b1ds7y27prb1h144"; + rev = "dbd5f6a5116f74ccf89b2ea18d59b629397c7940"; + sha256 = "1mmm5h14p7jgalvgl68m9gj0dfl1r29kf5z7h4vmzy07q3nm8xq3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2772,24 +2784,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-03"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "511f733cf2c6247f7a1b62b90e4bf0dfdae17a9f"; - sha256 = "0h32ghhmlpa4xpblxvsjlrivnfz55rpm84fri9diisshk48dkn62"; + rev = "f4a2f500afde3624e41557781117d7f50ccc7223"; + sha256 = "08fflc2ky7zpb0wazim5v46fhqcm8sadpsvkjml544gv29yjx7f3"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-07-15"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a787bcd1d9afb2bd6bab13834c5b28e727f266c0"; - sha256 = "12i4bvgm26sfvdanjjwz1572nfnyax1i2bwawfkz2ab34xlwcr0y"; + rev = "b665ea59600f91afe87b8665faec8155c09420f8"; + sha256 = "0s6n2dsbvr4qr79g8bcil8r80q931m4w6wp7qf4y2lxasjmnnf5g"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3144,12 +3156,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "ec50b3cbb4537625c2aaba7601232a53ccd779aa"; - sha256 = "0k5l9phs211xw6c3q9q52x6m6gfhk4b2fxhyr3m19mghbzmichha"; + rev = "ba9b6535381690fc6773d682fc046d8ddd2a863a"; + sha256 = "0n2pbl9fcvqp0ikhmlg1rfaig24awkhg8lv79zn6k37yx29kissi"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3276,12 +3288,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2021-06-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "d2e1e6b4c4e17cab2debd0353fed77b417b53237"; - sha256 = "0bwlcija1sbml5ni7mz4q97hhnl7hiqamzzvqw8qyp8aw2b0kj1q"; + rev = "f490d5db67f91c41f86a9d796b42af9a6a3b0d01"; + sha256 = "1n0fd71hjyrw22p4a2cd3l153p1bnjw15y9vpdzncchy7r6wxdcs"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3468,12 +3480,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-08-03"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "8f845e0a21b1d28cd41709b40b042f2e96113e47"; - sha256 = "04avnpb4xils6hj7raxyvygj6cbwwkmn96fk9q7mvhy33534crm1"; + rev = "5cb83dfa9158512ead196e449b86eab952a17931"; + sha256 = "0b8kzgsa9r58ns09bcgxak7jnf45al8d8fk6m812ci0l381xxlkk"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3504,12 +3516,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-04"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "bbaf11b0104f921348a1e8f8a9f211c86e6867e1"; - sha256 = "15vkqy1nf0yi6y94npzlqncblh2h4mlhji4wwsdlbk86c493j4wj"; + rev = "2f7407775d532b17c3a67a1d948ec910674cd8b0"; + sha256 = "1jsrl0079jp0pfv4235b1ghhv911dlnrz0mshbbm8bby4jd3q3a4"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3552,12 +3564,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-02"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "8b937f612e44e62c29db497b6af149719c30b9aa"; - sha256 = "1s32zby1h0id8ciyi927wl63b8plzg3cg38akj73iqpv7dhdqgls"; + rev = "50fec950de31edc84bb7799b6a692a187037c03b"; + sha256 = "05gs9zws4g3y3nn5xyqd4j145f37j8ibax3lrash100jr2v7m8h6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3720,12 +3732,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-04"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "52d60a93013fa2dbbefce6e8b000f08ea0ca8a36"; - sha256 = "0pib5gmryixn6j0cshkl94syzd5jribj6spdjdj85s6z0r55qck8"; + rev = "0f6f0717c55a1e92b1e1a5f08f4bb03234a9bc39"; + sha256 = "1p4dvafi0kqxnfw46085jk14lk47hcippkw9b1lqi1kjimgxwwwg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3744,12 +3756,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-07-31"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a0c6b2756f5faabf997a27fdbb085b3931f5945b"; - sha256 = "14p445rdhimr4pykz4wyra3ya3h4x70vh7xlajfrdpsb3wwd94mc"; + rev = "2a9e67310b333eabf0a15acc0c78da42e9e8202e"; + sha256 = "1jv6pal9rvhn9lmc932g5fsj1g0s5sq3p22c1kk4xvzlhv8i6j69"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3768,12 +3780,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "662159eeb112c076d90b2c3fe799f16a8165e4a6"; - sha256 = "0jazw69444zcvvzj7j8k2zjqwyymgcsvz42pxq10ll58apmjrzri"; + rev = "8b1e79a1d04e4b077aab1706891ed48e397bcaea"; + sha256 = "093hc1n899d1w2x07vq0x2lx144w2w8acnlsis1pmqj4d2z9c0bf"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3804,12 +3816,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "14029645caaecaa4392a6f89bf087a4aec5672cd"; - sha256 = "0pviz0dh519yaddrb3lrsa8pg1q4dp4h2a2chzh2nnwhr7973qjr"; + rev = "2ee19cd937c98d4d40d77ae729c70fe0923a2b8c"; + sha256 = "0zldabxim43380x7i9cnan8mwjhbdffcg3vgk9zcpm4b5phr3j9z"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -3852,24 +3864,24 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-08-03"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "66a7ea31fb571fddbfab9244d343612c83ae40f0"; - sha256 = "143sj5kqx880bfabd816x4h0ckrvd3mc5wqv9h1rbw4vlbpk5zj0"; + rev = "cdeb723ffe955ff0d3fdcbbe3776632da2b41513"; + sha256 = "1r67avqfqv7rzjg1whwacy0938nql0j0vxb6rwsc4ay19zv1nng9"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-08-02"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "7bed04718e146787c54784853817797258703f0a"; - sha256 = "1g1vb9kgc13mqji3yrd4wjpryrvf605yf251k6gfkpnaz0mhzlz9"; + rev = "e5a534f51ba65e3a28742b640b6b4702726189a5"; + sha256 = "1m4sal8wz7z05kvim2c08clzqcqvzfw7jz8dmyk41nllpg2kppqr"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -3888,12 +3900,12 @@ final: prev: nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-08-03"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "b7c04d6701b67795687c5d3b088be0218945b561"; - sha256 = "0hqc8avln563bjdm7lsxjll37k3njy5nd767bg8yg8vm0mv8zn0p"; + rev = "bcc0fa0eb585b5639fbc756c1463cdc8d31f33e6"; + sha256 = "0ikdrsym0a2ik9rrsclp83gbj73r2chsbin7y54qy16dmii001gy"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3934,6 +3946,18 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; + nvim-ts-context-commentstring = buildVimPluginFrom2Nix { + pname = "nvim-ts-context-commentstring"; + version = "2021-07-06"; + src = fetchFromGitHub { + owner = "joosepalviste"; + repo = "nvim-ts-context-commentstring"; + rev = "a38c22022fe0ae8e8aae1ba9294a33b903eef409"; + sha256 = "0fqr68360fmfygirr65iapf9fp5ganvn69gw3p3k1blnx17jlzbk"; + }; + meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; + }; + nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; version = "2021-08-01"; @@ -3948,12 +3972,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-08-04"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "64389d5956df699c9c671e00818cc4039edb7dd9"; - sha256 = "0q72jsyldpk9x3whjh8pggiscrir614zl9d65cbzrlklmmpif6d6"; + rev = "faa2ef217b18208a43537446b99dca9071eda52e"; + sha256 = "156g1lfqxqdiiqsdscn6kx9rm0s689k8vrnmq6vv06a74fpz345x"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4104,12 +4128,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-08-05"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "a6901b9d15dc17be94a2caf6b2fb8d1323278a74"; - sha256 = "0lyq8pi0c9665gjhg3wzx8889xq649fjld1cbv5bm2znmq000c8j"; + rev = "c0954d66fa658181c72733cda2991d258b47e816"; + sha256 = "1sjlffaymvci4lhrvnjndwnqbgm8n5379i14ipdjf0gqgd9xsczr"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4453,12 +4477,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-07-11"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "8b02ba8dc9a2946f90f51cc43ff1175b0f916616"; - sha256 = "10xrwxm5qpb1d25d5kr485xik4wmgr0pz92jn9w5rbf6widsdi7a"; + rev = "3ce2624dba442ae9bb04a5eeccd8aaef02f52ff2"; + sha256 = "0bb3mncvlm0mkn47s4mfz6rx63pq6ywvss0akz9zssph5jy1knga"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4778,12 +4802,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-29"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "f4f43c13af9d1dfb5bbe7c43d76de27d2af2d1cd"; - sha256 = "1yqqgckjg7hr8q33q49rxf678crl8dk9avs56h9yrgi0f8zs90qk"; + rev = "c76023c57a34e5cb0852f49061d5181a743db358"; + sha256 = "010cm39w3av8agk2d5z22vp8s1s13i17njbwvi56hyjmwsa706vf"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4899,12 +4923,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-05"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "527a306000c02f81075045d461349efcfa26c022"; - sha256 = "1v99ibx1ypijpm1icy0lsyfvf41rz0zhv18rvhrinyphr0jl546j"; + rev = "58db9ca9d92618af78440e05bc5fc2dac9311fcd"; + sha256 = "0wxgl7w2qp24ggq4z6s58jpw7cv1qlbxks7sc8vkfsyiyy5b89xl"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5092,12 +5116,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-08-04"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "cd74f18d10d3d89d6088ec6d6d8400f9f1845c08"; - sha256 = "0s89lsc6hi110d7wj3gaflra3wsqs87pb5pa1vrqg5wvmsn77jzx"; + rev = "ab6f2d5a683041a46c48b28418d4a2a01bbd5551"; + sha256 = "1xgcgmp1nbf038wzs3v6ja9wpn1grgh4a1d89a5big6rnjcvfmc1"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5213,12 +5237,12 @@ final: prev: telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols-nvim"; - version = "2021-06-15"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "e211b6aeed1f94ca660c407f3052f83ab8f4b2a9"; - sha256 = "0nd02akh5nmcnv8mqih6xpzc4pbhys6rva7v60p38kxx50ycfkvw"; + rev = "d2d7d6b4298a1f733649526661d872c5e7a75521"; + sha256 = "0jxnalhfgmnllwb38a9dgzrnrhdnxgcbi2p7m4jk5p87260a9gvk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; @@ -5237,12 +5261,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-04"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e7362e999683b4a0d18ec51656de93a9a9d98091"; - sha256 = "1hqsscl6xl6qf4vczn9sczz4ymzijmw7n66bfdipc5ikn9aydxcn"; + rev = "273942cc478b356d7b2e0a5211281daaef69d161"; + sha256 = "1w2h6lvk5jz6v19m89cd019mbdz47b55qcx05nyx65j3jrn0n8av"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5358,12 +5382,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight-nvim"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a5b3cbe750ed6a05a018ac81782bb01de512a6c9"; - sha256 = "1zggbj1xkqigc9rk6mm6jdwk67kcq1avrrq3hxy7jkfc11ynbl91"; + rev = "8e8a11e001b0af4849cba47265d11eda93b82f51"; + sha256 = "10glan84axsckz9050c38rh91pwra68jdlnrw9ihdmls5d4sxgs0"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -5442,12 +5466,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight-nvim"; - version = "2021-08-05"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "0ac66e85f2d8d7c6eb7d263ffc39fa19b56d882f"; - sha256 = "0a0bbj9lwpxwql8m56qxr1qjvfb3qb1cj6knfhdvgaskilv5mlg1"; + rev = "8ab43c0fdc246fdd82382d7ef4ec383f8f755ef9"; + sha256 = "0fh752l53yk3bnas07kds7vhmdnxrbslq126qdyqb6f1xgzb9gjj"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -6114,12 +6138,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-06"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "cf229cd88ecf9ee9e157d6737770b289de24d3bd"; - sha256 = "06cn9z7p39qvp34533azj2xc3jyj6bi8kb4aasq52awizdg3flvz"; + rev = "dffb352d5f49792a4df5653d7adab07a1c688928"; + sha256 = "1rqm6wsdpx5n6l4kkrxm8bw2837mm63b5n1igq1v4ji5zbjz6si2"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6894,12 +6918,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-05"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "e9f913ff8a6f76062e0aa95b60d740ec690f6f4f"; - sha256 = "0i2j15yqndzfisf7x1cdszs7s32gh57wravgar3pmk13ffcx4n0s"; + rev = "55382eb722407daaebe1db1f7f7ed99d99302cf5"; + sha256 = "0nxcv69sicgbsns6x0ld9z33mlg2kv3dggvln1i99a0ljxr4p8xm"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6966,12 +6990,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-07-12"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "7d9b7125ff2533f6c520573f54e91db2f13a44b0"; - sha256 = "1ckz2b7y6y483d0ignkv8mm0xf9jbs8k3srp50m7sj24nsdadb1v"; + rev = "549fb96d5890d5225afda070ca041468c2c770e5"; + sha256 = "1zqns0rd456138qhib8pkvg2bg2lf81f2zi1dphkdp3ajym6mkh6"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8181,12 +8205,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-05-21"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "20fade09069cd35602387c2e7d2a7cd0f6cff8b0"; - sha256 = "1ym87hd85l67976dxk919mdwab8fi8iq8azqk4mpa75gzl2ia7wl"; + rev = "e2a6ec4fb91b38591445bdaa9972f54653dbcd49"; + sha256 = "031xy0h9a55ijfq6ni237x4xl2ywbwm3ad0r0h05dj8g1352s1vr"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -9009,12 +9033,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-07-26"; + version = "2021-08-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "48c9dcd59e40d028fde5e5899deacc4aff27bb15"; - sha256 = "0ym3w45aw3h1wjw2lxazfind1b6wmdllpsfhdwxc9ldy39bsnnfc"; + rev = "5e4c41a744523a7e300d3e1613cf3201709b0b03"; + sha256 = "036dyas04hrhhv1s747g4pv2qhi4pfyyxjifidrg5s1dx68zd6p2"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -9610,12 +9634,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2021-07-12"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "df53e9c5fce91a84e1d6e8722956a01595d16c40"; - sha256 = "0zndnmdmxlr6114d29sc1q8fc0s2zlsrj1v28gp0sgnim1rmavfp"; + rev = "825dfeee28f5331f68de0eeb512775127ab4cae9"; + sha256 = "0d7aav979sqc1pk5k2nmf13n8lgdsrc6hq5r2hx0r77z4bc42wms"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -9947,12 +9971,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder-nvim"; - version = "2021-08-02"; + version = "2021-08-07"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "a8a2feda01b8d498b49ef133f648297959de2fa8"; - sha256 = "0sbcgv6zw9i7mv8plv7kr14zpvd24wlbgpx1k0hdfs3wbb8md9ya"; + rev = "719e83269062b7421a4e82f3d77263915b12d452"; + sha256 = "0qd66h72v4n8w9xh1dziihqhly44yn31r12a8pb19qy1fgqmrp78"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 5f75e705cb..492080a89e 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -260,6 +260,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug +joosepalviste/nvim-ts-context-commentstring@main josa42/coc-lua josa42/vim-lightline-coc jose-elias-alvarez/null-ls.nvim@main @@ -596,6 +597,7 @@ RRethy/nvim-base16 RRethy/vim-hexokinase RRethy/vim-illuminate rstacruz/vim-closer +ruifm/gitlinker.nvim rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index a1a43a8f3d..89fc84022f 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -17,7 +17,7 @@ "eslint": "^7.30.0", "glob": "^7.1.6", "mocha": "^9.0.2", - "rollup": "^2.51.1", + "rollup": "=2.51.1", "tslib": "^2.3.0", "typescript": "^4.3.5", "typescript-formatter": "^7.2.2", diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 0136bf4e5b..143a74fe82 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,6 +1,11 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, vscode-utils, jq, rust-analyzer, nodePackages +{ lib +, vscode-utils +, jq +, rust-analyzer +, nodePackages , setDefaultServerPath ? true +, moreutils }: let @@ -24,19 +29,19 @@ let ''; }; -in vscode-utils.buildVscodeExtension { +in +vscode-utils.buildVscodeExtension { inherit version vsix; name = "${pname}-${version}"; src = "${vsix}/${pname}.zip"; vscodeExtUniqueId = "${publisher}.${pname}"; - nativeBuildInputs = lib.optional setDefaultServerPath jq; + nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ]; preInstall = lib.optionalString setDefaultServerPath '' - jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \ + jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \ --arg s "${rust-analyzer}/bin/rust-analyzer" \ - package.json >package.json.new - mv package.json.new package.json + package.json | sponge package.json ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix index fb5a5d0621..e44f90a363 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, libaio }: -stdenv.mkDerivation { - name = "blktrace-1.2.0"; +stdenv.mkDerivation rec { + pname = "blktrace"; + version = "1.3.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; - sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; + url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; + sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; }; buildInputs = [ libaio ]; @@ -16,9 +17,10 @@ stdenv.mkDerivation { sed s,/usr/local,$out, -i Makefile ''; - meta = { + meta = with lib; { description = "Block layer IO tracing mechanism"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ ]; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index 1b5a0e3bdf..d937d4b75f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre +{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { @@ -6,18 +6,19 @@ stdenv.mkDerivation rec { version = "20.11.00"; src = fetchzip { - url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; + url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr"; stripRoot = false; }; - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" - substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/iasl" "${iasl}/bin/iasl" + substituteInPlace src/lib/include/fwts_binpaths.h \ + --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ + --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ + --replace "/usr/bin/iasl" "${iasl}/bin/iasl" ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 62e88d0185..587266ec99 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.7"; + version = "5.13.9"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-6SppDriZWzLu6Qye1e6ciiE+Ro63vDyabxfgWS/PTSo="; + sha256 = "sha256-cr5tmJVpjd9czlR1PklJccZ3wc+E1eJgQhhNooFEQ4I="; }; structuredExtraConfig = with lib.kernel; { @@ -48,7 +48,7 @@ buildLinux (args // rec { extraMeta = { branch = "5.13-cacule"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix index b20632be33..85e4065e90 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "175"; + version = "178"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "sha256-Xzbck/nRdTR9H5o2XVFlFdNLz2ve65KEcefKAKe0eW8="; + sha256 = "sha256-++R/R3oRw0O0MoDnASdVr9UIiI0yS4UcIO8nV62PLzE="; }; postPatch = '' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { errors are logged to /var/log/mcelog or syslog or the journal. ''; homepage = "http://mcelog.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix index 07113e6286..6e387de071 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openrazer/driver.nix @@ -30,11 +30,13 @@ stdenv.mkDerivation (common // { install -m 644 -v -D install_files/udev/99-razer.rules $RAZER_RULES_OUT install -m 755 -v -D install_files/udev/razer_mount $RAZER_MOUNT_OUT substituteInPlace $RAZER_RULES_OUT \ - --replace razer_mount $RAZER_MOUNT_OUT + --replace razer_mount $RAZER_MOUNT_OUT \ + --replace plugdev openrazer substituteInPlace $RAZER_MOUNT_OUT \ --replace /usr/bin/logger ${util-linux}/bin/logger \ --replace chgrp ${coreutils}/bin/chgrp \ - --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" + --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" \ + --replace plugdev openrazer runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix index f7bcc2fd6a..6d423be738 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "psftools"; - version = "1.0.14"; + version = "1.1.0"; src = fetchurl { url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz"; - sha256 = "17nia5n5rabbh42gz51c8y53rjwddria4j3wvzk8dd0llj7k1y6w"; + sha256 = "sha256-P9eIHtEXC55C2rXweJ9Vw93tIspjjQ6MCQ44FJDEook="; }; outputs = ["out" "man" "dev" "lib"]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix index 8f9acdf066..5ee5b0bda5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, withoutInitTools ? false }: -let version = "2.97"; in +let version = "2.99"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; - sha256 = "042iyayyh3j28vfbypzn822b73r3nfmyn79f9mixigqrfn2rcn9d"; + sha256 = "sha256-sFw2d7tpiv5kyZeWiwDEmyqb0yDOljUjIw7n6kEZd1c="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 63a8b13f4f..112e6d2567 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ xwvvvvwx ]; + maintainers = with maintainers; [ d-xo ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix index 5e6556029c..1d214b751f 100644 --- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-BzQp466Zlp7n56n4SUH4cDRTt8EUWGw3q1dxIBB3TBM="; + sha256 = "sha256-F2e+peM7DBihmos/oPar36UDHkibmlzIknCjMauOph8="; }; - vendorSha256 = "sha256-ak7fWcAXbyVAiyaJZBGMoe2i2nDh4vc/gCC9nbjadJ0="; + vendorSha256 = "sha256-M6mnFO+SInZNvtwMa02TvHIg14Ve7swlGcYfsQFioxQ="; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/third_party/nixpkgs/pkgs/servers/felix/default.nix b/third_party/nixpkgs/pkgs/servers/felix/default.nix index dd9d34c85f..1f355e61e4 100644 --- a/third_party/nixpkgs/pkgs/servers/felix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; + sha256 = "sha256-ea1QYUqf6m3HB17TrEQ7UEc48fl5QHQMYsN3t0T9VD4="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index b97c1f977f..86754710ff 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-0fa6V85NwURwsW1Mk1eMPtOWNqTe7x9BSuoCUrSJ/s8="; + sha256 = "sha256-AclIH2Gd8U/Hfy24KOFic/np4qAWELlIMfsPCSkdjog="; }; - vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo="; + vendorSha256 = "sha256-UIBH6Pf2mmXBsdFW0RRvedLQhonNsrl4j2fxxRtum4M="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index f39df1838d..6925f4a762 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,14 @@ # Do not edit! { - version = "2021.7.4"; + version = "2021.8.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; + "adax" = ps: with ps; [ ]; # missing inputs: adax "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -32,7 +33,7 @@ "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog - "analytics" = ps: with ps; [ aiohttp-cors ]; + "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant @@ -92,7 +93,7 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; @@ -183,7 +184,7 @@ "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods @@ -224,7 +225,8 @@ "emonitor" = ps: with ps; [ aioemonitor ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_kasa" = ps: with ps; [ sense-energy ]; - "emulated_roku" = ps: with ps; [ emulated-roku ]; + "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ]; + "energy" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ enocean ]; "enphase_envoy" = ps: with ps; [ envoy-reader ]; @@ -268,6 +270,7 @@ "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ pyflick ]; + "flipr" = ps: with ps; [ ]; # missing inputs: flipr-api "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ pyflume ]; @@ -286,20 +289,19 @@ "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; "freedompro" = ps: with ps; [ pyfreedompro ]; - "fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ]; + "fritz" = ps: with ps; [ aiohttp-cors fritzconnection ifaddr xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ pyfronius ]; - "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; - "garmin_connect" = ps: with ps; [ garminconnect-ha ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ ]; + "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ sqlalchemy ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client "geo_json_events" = ps: with ps; [ geojson-client ]; @@ -342,7 +344,7 @@ "hangouts" = ps: with ps; [ hangups ]; "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ pycec ]; @@ -371,7 +373,7 @@ "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense - "huawei_lte" = ps: with ps; [ getmac huawei-lte-api stringcase url-normalize ]; + "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; @@ -460,7 +462,7 @@ "litterrobot" = ps: with ps; [ pylitterbot ]; "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; - "local_ip" = ps: with ps; [ ]; + "local_ip" = ps: with ps; [ aiohttp-cors ifaddr ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; @@ -484,7 +486,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ mastodon-py ]; "matrix" = ps: with ps; [ matrix-client ]; @@ -528,7 +530,7 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds - "motioneye" = ps: with ps; [ motioneye-client ]; + "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -540,7 +542,7 @@ "mullvad" = ps: with ps; [ mullvad-api ]; "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; - "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; @@ -566,7 +568,7 @@ "nexia" = ps: with ps; [ nexia ]; "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext "nextcloud" = ps: with ps; [ nextcloudmonitor ]; - "nfandroidtv" = ps: with ps; [ ]; + "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient @@ -596,7 +598,7 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ omnilogic ]; - "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; @@ -628,8 +630,8 @@ "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -657,6 +659,7 @@ "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prosegur" = ps: with ps; [ ]; # missing inputs: pyprosegur "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ proxmoxer ]; @@ -696,6 +699,7 @@ "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero + "renault" = ps: with ps; [ ]; # missing inputs: renault-api "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; @@ -717,16 +721,16 @@ "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_power" = ps: with ps; [ ]; # missing inputs: rpi-bad-power - "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf + "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow ]; + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ]; + "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter @@ -763,6 +767,7 @@ "simplisafe" = ps: with ps; [ simplisafe-python ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms + "siren" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub "skybeacon" = ps: with ps; [ pygatt ]; @@ -793,7 +798,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -833,7 +838,7 @@ "syncthing" = ps: with ps; [ aiosyncthing ]; "syncthru" = ps: with ps; [ pysyncthru url-normalize ]; "synology_chat" = ps: with ps; [ ]; - "synology_dsm" = ps: with ps; [ synologydsm-api ]; + "synology_dsm" = ps: with ps; [ ]; # missing inputs: py-synologydsm-api "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; @@ -969,7 +974,6 @@ "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; - "wunderground" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; @@ -989,6 +993,7 @@ "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "youless" = ps: with ps; [ ]; # missing inputs: youless-api "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 5601a6c0cd..ce08141358 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -58,25 +58,6 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pyflunearyou>=2.0 - (self: super: { - pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec { - version = "1.0.7"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "pyflunearyou"; - rev = version; - sha256 = "0hq55k298m9a90qb3lasw9bi093hzndrah00rfq94bp53aq0is99"; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'msgpack = "^0.6.2"' 'msgpack = "*"' \ - --replace 'ujson = "^1.35"' 'ujson = "*"' - ''; - }); - }) - # Pinned due to API changes in pylast 4.2.1 (mkOverride "pylast" "4.2.0" "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3") @@ -157,7 +138,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.7.4"; + hassVersion = "2021.8.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -174,7 +155,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk"; + sha256 = "02hm4x1qx9vd39d9l2gl2pnfnjmpk6p2w72lj45cvp3jimdg30fz"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -388,7 +369,6 @@ in with py.pkgs; buildPythonApplication rec { "fritzbox_callmonitor" "frontend" "garages_amsterdam" - "garmin_connect" "gdacs" "generic" "generic_thermostat" @@ -430,7 +410,8 @@ in with py.pkgs; buildPythonApplication rec { "home_connect" "home_plus_control" "homeassistant" - "homekit" + # disable homekit tests because they fail in the network component + #"homekit" "homekit_controller" "homematic" "homematicip_cloud" @@ -658,7 +639,6 @@ in with py.pkgs; buildPythonApplication rec { "switcher_kis" "syncthing" "syncthru" - "synology_dsm" "system_health" "system_log" "tado" @@ -731,7 +711,6 @@ in with py.pkgs; buildPythonApplication rec { "workday" "worldclock" "wsdot" - "wunderground" "xbox" "xiaomi" "xiaomi_aqara" @@ -791,8 +770,15 @@ in with py.pkgs; buildPythonApplication rec { # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" - # tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access + # default_config/test_init.py: Tries to check for updates and fails ungracefully without network access "--deselect tests/components/default_config/test_init.py::test_setup" + # local_ip/test_{init,config_flow}.py: tries to lookup a route towards a multicast address and fails + "--deselect tests/components/local_ip/test_init.py::test_basic_setup" + "--deselect tests/components/local_ip/test_config_flow.py::test_config_flow" + # netatmo/test_select.py: NoneType object has no attribute state + "--deselect tests/components/netatmo/test_select.py::test_select_schedule_thermostats" + # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' + "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -828,8 +814,6 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" - # homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group - "test_homekit_uses_system_zeroconf" # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' "test_lock_update_via_pubnub" ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index a42b13a260..72e48629a6 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210707.0"; + version = "20210804.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg="; + sha256 = "sha256-0VCukSHI4PXAecxHc1DJSQ1GrErenNb0K4OhSIgkQbs="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh index 8b17dabdfe..56f7b0aaed 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/update.sh @@ -36,5 +36,5 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ nix-update --version "$TARGET_VERSION" --build home-assistant ) -git add ./component-packages.nix ./default.nix ./frontend.nix -git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +#git add ./component-packages.nix ./default.nix ./frontend.nix +#git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index ccda9bcddb..a5b241b207 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.459"; + version = "0.18.531"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk="; + sha256 = "sha256-ZykgYzE86bt5SNeHng995TQuE15ajWhThgqt2fJFizc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 61d5cd26b4..f8e9ec33cf 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.0.0"; + version = "15.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-DOqqf4RWA2eo4m60tzs4HgKktci0fIV7CiJekDcjCXE="; + sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index ad67cdf434..c84dc85ef9 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.14"; + version = "0.5.15"; runVend = true; - vendorSha256 = "sha256-StkgU11VLEKg89kn3zPcdC8HBw9MmJrfDPGk1SUQO64="; + vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "sha256-GxgpGI1ymhbYhzCP2Bs5wJ5kq5rHHkClXcAsYlaQ/AM="; + sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ="; }; # livepeer_cli has a vendoring problem diff --git a/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix index b61332be24..67dbea9c47 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postsrsd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postsrsd"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "sha256-AqOHHOnGqOnIw5hPPiJjUJFiwngTux7gwn8qig0t7hs="; + sha256 = "sha256-M1VtH+AToLh9J4zwIznInfFJzqmKElTvqAgI+qqL+Lw="; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index cc06cc6ee6..348a2088f2 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; - sha256 = "0qsl18p2swdbq4zizvs9ahl2bkilpcyzq817lk16jj5g4rqzivb7"; + sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index f54657db38..41d0d5b046 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -1,4 +1,6 @@ -{ lib, python3, mautrix-telegram, fetchFromGitHub }: +{ lib, python3, mautrix-telegram, fetchFromGitHub +, withE2BE ? true +}: let python = python3.override { @@ -36,7 +38,7 @@ in python.pkgs.buildPythonPackage rec { sed -i -e '/alembic>/d' requirements.txt ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python.pkgs; ([ Mako aiohttp mautrix @@ -49,7 +51,12 @@ in python.pkgs.buildPythonPackage rec { pillow lxml setuptools - ] ++ dbDrivers; + ] ++ lib.optionals withE2BE [ + asyncpg + python-olm + pycryptodome + unpaddedbase64 + ]) ++ dbDrivers; # `alembic` (a database migration tool) is only needed for the initial setup, # and not needed during the actual runtime. However `alembic` requires `mautrix-telegram` diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index a5b2f14e9d..c2f9e206e9 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-whatsapp"; + owner = "mautrix"; + repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; + vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ vskilet ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index d244abf2e6..1651835e30 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -30,11 +30,13 @@ buildGoModule rec { subPackages = [ "." ]; - preBuild = let t = "github.com/minio/minio/cmd"; in - '' - export CGO_ENABLED=0 - buildFlagsArray+=("-tags" "kqueue" "-ldflags" "-s -w -X ${t}.Version=${versionToTimestamp version} -X ${t}.ReleaseTag=RELEASE.${version} -X ${t}.CommitID=${src.rev}") - ''; + CGO_ENABLED = 0; + + tags = [ "kqueue" ]; + + ldflags = let t = "github.com/minio/minio/cmd"; in [ + "-s" "-w" "-X ${t}.Version=${versionToTimestamp version}" "-X ${t}.ReleaseTag=RELEASE.${version}" "-X ${t}.CommitID=${src.rev}" + ]; passthru.tests.minio = nixosTests.minio; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 2c8ba20f6d..226efe51f5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.6"; + version = "8.1.0"; - excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\)"; + excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-incw/Uv1Jeg/WAkWUgJGvdJ2OpZYfkCAvgLW/qXWXEo="; + sha256 = "sha256-l7tVsxyUJ+WEPA3q3pcW3W74/2YlSgz84Au1A9a7s/E="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-JSpNAi9NvZpo0HzdDmdi1i+lNGLylHgctT6PPWHNhkk="; + sha256 = "sha256-OsjIK9NOU5XynzUOLyntTquH0UPwL/Eqw9XjaDsSO+g="; }; - vendorSha256 = "sha256-72i2NgulRpdBZ9dwx+0VlKDzzNnBJgEKKizrLPwzUY4="; + vendorSha256 = "sha256-cfErlr7YS+8TVy0+XWDiA3h1lMoV3efdsjuH+yEcwXs="; preBuild = '' # The testcase makes an API call against grafana.com: diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 83150e4247..d23a873cce 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.2.1"; + version = "2.3.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290="; + sha256 = "sha256-Cxg3VRF4p/Kb6LyreGV0g+zPr15wplritSZgkbTiDI0="; }; vendorSha256 = null; @@ -24,7 +24,7 @@ buildGoModule rec { # TODO split every executable into its own package "cmd/loki" "cmd/loki-canary" - "cmd/promtail" + "clients/cmd/promtail" "cmd/logcli" ]; @@ -38,16 +38,21 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) loki; }; - buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in - '' - -ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown - ''; + ldflags = let t = "github.com/grafana/loki/pkg/util/build"; in [ + "-s" + "-w" + "-X ${t}.Version=${version}" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.Revision=unknown" + ]; doCheck = true; meta = with lib; { description = "Like Prometheus, but for logs"; - license = licenses.asl20; + license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; maintainers = with maintainers; [ willibutz globin mmahut ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index f4ad8a8e7b..19136a3977 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -47,21 +47,19 @@ buildGoModule rec { ln -s ${webui} web/ui/static/react ''; - buildFlags = "-tags=builtinassets"; - buildFlagsArray = + tags = [ "builtinassets" ]; + + ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ - '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - '' + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; # only run this in the real build, not during the vendor build diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index a24edd2fbb..8f71c0123d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = optional withSystemdSupport makeWrapper; buildInputs = optional withSystemdSupport systemd; - buildFlags = optional (!withSystemdSupport) "-tags nosystemd"; + tags = optional (!withSystemdSupport) "nosystemd"; goDeps = ./postfix-exporter-deps.nix; extraSrcs = optionals withSystemdSupport [ diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index eef79853b3..042772c95d 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.9"; + version = "0.22.10"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-Qw7qJqxcBKxshT/qbVUegE1Tpt4QV5WbUHT2+qLbr9o="; + sha256 = "sha256-h9dmi8AI8ZCjF4nlTi07uOWKs+8gly2HhSbPRB3Jl0g="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 1776987bae..f4131f6338 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -44,18 +44,18 @@ in { ''; nextcloud20 = generic { - version = "20.0.11"; - sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; + version = "20.0.12"; + sha256 = "sha256-gIIPuWVcWv/5nuXMWticcPBKMjJVsCmvs83tj8fdbgY="; }; nextcloud21 = generic { - version = "21.0.3"; - sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; + version = "21.0.4"; + sha256 = "sha256-Sg0w/r+6UxGLqZCgwtLBZ2e3eqZ2r8k30gGNaGXF/jo="; }; nextcloud22 = generic { - version = "22.0.0"; - sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo="; + version = "22.1.0"; + sha256 = "sha256-SCCAj3mRRoU2BOH6J9fykkSQGKRNxzv5KKl7AgKDGLo="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/third_party/nixpkgs/pkgs/servers/nitter/default.nix b/third_party/nixpkgs/pkgs/servers/nitter/default.nix index 47352edf48..b5137c92b4 100644 --- a/third_party/nixpkgs/pkgs/servers/nitter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nitter/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, nixosTests , fetchFromGitHub , nim , libsass @@ -120,6 +121,10 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + inherit (nixosTests) nitter; + }; + meta = with lib; { description = "Alternative Twitter front-end"; homepage = "https://github.com/zedeus/nitter"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index 16449d73fd..df3e116ab7 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.6"; + version = "1.8.9"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v58druwTVeUOItbBUNr8lNsFlam9v0sxXlTeHlM0g6A="; + sha256 = "sha256-LavOnVREu7uLWcdM9zIonqoYPJBdY2j5eKMeVNXa1dk="; }; - vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o="; + vendorSha256 = "sha256-jgAbEWXL1LYRN7ud9ij0Z1KBGHPZ0sRq78tsK92ob8k="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index 1e65689444..bba51c6a80 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -102,12 +102,12 @@ in buildGoModule { go generate popd done - export buildFlagsArray=( - -tags="assets" - -ldflags="-X main.commit=${shorthash} -X main.version=${version}" - ) ''; + tags = [ "assets" ]; + + ldflags = [ "-X main.commit=${shorthash}" "-X main.version=${version}" ]; + meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 7d9009f8c6..113866c391 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.24.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs="; + sha256 = "sha256-Px2b0s10N5uDYsz95/1cT2tfS/NfhRfKmCdXIaMb5Po="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY="; + vendorSha256 = "sha256-6KjSmxNLY0msMqpPZR7LUZV63Pj6JGhGVRWTKbbnDtk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 2e1f68f6b1..4e0d3d0b70 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,31 +2,28 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-wbww6pYq2ATRRmeUAzFDGKzLk6MNYyGp6QKf8ybeaTc="; + sha256 = "sha256-jjxO35PaxEI9n0qsawTPt3mHNC0PjWfmEA4NkIAwyTY="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-NIf5nyUXZY5UGFcdjeeFZdGKVcD2pve+PytziCD2NFk="; + vendorSha256 = "sha256-2MPenTV0fgvXbf8WkoPd9uApPSDLPyHtCq9o3CHB/D0="; doCheck = false; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; - preBuild = '' - export buildFlagsArray=( - -tags="xversion" - -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version}" - ) - ''; + tags = [ "xversion" ]; + + ldflags = [ "-X tailscale.com/version.Long=${version}" "-X tailscale.com/version.Short=${version}" ]; postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix index c24857d9dc..0ae5523c35 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; + sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s="; }; vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index cdbb8c4a34..d5ecdf2f5d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -4,112 +4,112 @@ let sources = { - "@financial-times/polyfill-useragent-normaliser-1.9.0" = { + "@financial-times/polyfill-useragent-normaliser-1.10.0" = { name = "_at_financial-times_slash_polyfill-useragent-normaliser"; packageName = "@financial-times/polyfill-useragent-normaliser"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.9.0.tgz"; - sha512 = "jrVQ42tT1RrWyR/hkJlro2HhHZMPGXknKfJyZabe0CYj1c1KIqdS1JhhXEOt0T9ntaRCYq56y2/hAMM6LOU73g=="; + url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.0.tgz"; + sha512 = "OQYm8qoegUzHZgpNjw0QSmcoH8Tu+fbY9/wTOqbK/2lj3qWNZpGdBimTV1qp8xwF+SVyL2vNzZEjTxSlbjNOSA=="; }; }; - "@financial-times/useragent_parser-1.5.1" = { + "@financial-times/useragent_parser-1.6.0" = { name = "_at_financial-times_slash_useragent_parser"; packageName = "@financial-times/useragent_parser"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.5.1.tgz"; - sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ=="; + url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.0.tgz"; + sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g=="; }; }; - "@formatjs/ecma402-abstract-1.5.1" = { + "@formatjs/ecma402-abstract-1.8.0" = { name = "_at_formatjs_slash_ecma402-abstract"; packageName = "@formatjs/ecma402-abstract"; - version = "1.5.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz"; - sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA=="; + url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.8.0.tgz"; + sha512 = "X+nxZcIQr0YfYNtw1ZkHjN3YSyi0fEmdAJqRzk24KwNvqLv7GmVfw70mf7ADnwOvkcrSaAdx24GfAqckGTv9ww=="; }; }; - "@formatjs/intl-datetimeformat-3.2.3" = { + "@formatjs/intl-datetimeformat-4.1.0" = { name = "_at_formatjs_slash_intl-datetimeformat"; packageName = "@formatjs/intl-datetimeformat"; - version = "3.2.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz"; - sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg=="; + url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-4.1.0.tgz"; + sha512 = "rEAPnIIsiOpjXMqoMdxClJ4Q2uhKTN1WH2fQUCJrg4FYdqfevJeymSowdLcOi1AYARIoTXTmlqS8pHIJx62VEw=="; }; }; - "@formatjs/intl-displaynames-4.0.4" = { + "@formatjs/intl-displaynames-5.1.0" = { name = "_at_formatjs_slash_intl-displaynames"; packageName = "@formatjs/intl-displaynames"; - version = "4.0.4"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz"; - sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA=="; + url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.1.0.tgz"; + sha512 = "2pwIlHcNBZ281ySsz/E6JURVDxWsIxHn/HyxmylxBQMeW2HeFq1YuP6ycAxSMfp+EtWAN4v8TgWJQM+YBI22FA=="; }; }; - "@formatjs/intl-getcanonicallocales-1.5.3" = { + "@formatjs/intl-getcanonicallocales-1.6.0" = { name = "_at_formatjs_slash_intl-getcanonicallocales"; packageName = "@formatjs/intl-getcanonicallocales"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.3.tgz"; - sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA=="; + url = "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.6.0.tgz"; + sha512 = "1967VujZeow0K0NpzerdNOaskcE0KwnnchxT8TzlkLs4RjXx7Uz0bjQPtUYGV7kvbgMJ9qb6tWmCqIwe3sBKUw=="; }; }; - "@formatjs/intl-listformat-5.0.4" = { + "@formatjs/intl-listformat-6.1.0" = { name = "_at_formatjs_slash_intl-listformat"; packageName = "@formatjs/intl-listformat"; - version = "5.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz"; - sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw=="; + url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.1.0.tgz"; + sha512 = "NsDKO0U1mVFZmoyZ0ztFL+biqztDKv1qdSvPA1S5yOYZddDy6G9SpnBZgNjhxUFIBqycNW95ibO/jrI5Ou4s5Q=="; }; }; - "@formatjs/intl-locale-2.4.13" = { + "@formatjs/intl-locale-2.4.26" = { name = "_at_formatjs_slash_intl-locale"; packageName = "@formatjs/intl-locale"; - version = "2.4.13"; + version = "2.4.26"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz"; - sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ=="; + url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.26.tgz"; + sha512 = "f5NyHb5qdfA0oO2IGLhNU0k9BWq8xI26VqxzZqjTfEKnn8xJ+SBE9drwRfTqlRz6pmvztPmkDg3FSflmGdDKGw=="; }; }; - "@formatjs/intl-numberformat-6.1.3" = { + "@formatjs/intl-numberformat-7.1.0" = { name = "_at_formatjs_slash_intl-numberformat"; packageName = "@formatjs/intl-numberformat"; - version = "6.1.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz"; - sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA=="; + url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-7.1.0.tgz"; + sha512 = "zwjacMSn+Ide2RXK2PN0veB7N7ay10tQ1Pb8eXeMB7zjRjJXHROi8O1ZA0dpJid0lw/5+5G2/lEdYvsPWLkaZA=="; }; }; - "@formatjs/intl-pluralrules-4.0.5" = { + "@formatjs/intl-pluralrules-4.0.20" = { name = "_at_formatjs_slash_intl-pluralrules"; packageName = "@formatjs/intl-pluralrules"; - version = "4.0.5"; + version = "4.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz"; - sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw=="; + url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.20.tgz"; + sha512 = "ayyjvIh9ShXQxo0Y9GhUTyW9zyB3jiBFRIEhMmGowpIlTVRhOwl57XZ+YuUgo/yCvtJqnvGPu/4/fQTouxHuGw=="; }; }; - "@formatjs/intl-relativetimeformat-8.0.3" = { + "@formatjs/intl-relativetimeformat-9.1.0" = { name = "_at_formatjs_slash_intl-relativetimeformat"; packageName = "@formatjs/intl-relativetimeformat"; - version = "8.0.3"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz"; - sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw=="; + url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-9.1.0.tgz"; + sha512 = "F4HmAk/ZYy9VNbrNOayGfPKEnj2ey6M9kMKf+UKL6QL21FOxLyY6e4okSG6VbAjZ0cYgKvEiNDjSuWP86qSo0g=="; }; }; - "@juggle/resize-observer-3.3.0" = { + "@juggle/resize-observer-3.3.1" = { name = "_at_juggle_slash_resize-observer"; packageName = "@juggle/resize-observer"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.0.tgz"; - sha512 = "P1v2nvK7z2gOLVM/bveIRLG9L99uEahTGgTltyF03zixZAjI9YmKLj5Z9MpS9wBIUt5WDoQORT2lXvLOIF89iA=="; + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz"; + sha512 = "zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="; }; }; "@types/component-emitter-1.2.10" = { @@ -121,40 +121,40 @@ let sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; }; }; - "@types/cookie-0.4.0" = { + "@types/cookie-0.4.1" = { name = "_at_types_slash_cookie"; packageName = "@types/cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"; - sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz"; + sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; }; }; - "@types/cors-2.8.10" = { + "@types/cors-2.8.12" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.10"; + version = "2.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz"; - sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; + sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/node-14.14.31" = { + "@types/node-16.4.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.31"; + version = "16.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz"; - sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.4.11.tgz"; + sha512 = "nWSFUbuNiPKJEe1IViuodSI+9cM+vpM8SWF/O6dJK7wmGRNq55U7XavJHrlRrPkSMuUZUFzg1xaZ1B+ZZCrRWw=="; }; }; - "@webcomponents/template-1.4.4" = { + "@webcomponents/template-1.5.0" = { name = "_at_webcomponents_slash_template"; packageName = "@webcomponents/template"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.4.4.tgz"; - sha512 = "QqCmmywIKJTilkl6UIPLxEBBuqhDaOBpvQyKOnUEwl9lJuVHBrVlhMIhhnp9VSZJ6xEUnp+PiX8DST1k0q/v4Q=="; + url = "https://registry.npmjs.org/@webcomponents/template/-/template-1.5.0.tgz"; + sha512 = "DPQgBAedzjsFD7rgv7b6OKmpHq5VTBUCLmYfDiov2FC2C79QGaz+4iNmlVAem5iSicvN8DWTwU1kZ48XYLtuqg=="; }; }; "Base64-1.1.0" = { @@ -220,13 +220,13 @@ let sha1 = "4b728faf0a19555194d4fbd05582f833fdcd137b"; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base64-arraybuffer-0.1.4" = { @@ -436,13 +436,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "engine.io-4.1.1" = { + "engine.io-5.1.1" = { name = "engine.io"; packageName = "engine.io"; - version = "4.1.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz"; - sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; + sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; }; }; "engine.io-parser-4.0.2" = { @@ -472,13 +472,13 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-source-polyfill-1.0.22" = { + "event-source-polyfill-1.0.24" = { name = "event-source-polyfill"; packageName = "event-source-polyfill"; - version = "1.0.22"; + version = "1.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.22.tgz"; - sha512 = "Fnk9E2p4rkZ3eJGBn2HDeZoBTpyjPxj8RX/whdr4Pm5622xYgYo1k48SUD649Xlo6nnoKRr2WwcUlneil/AZ8g=="; + url = "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.24.tgz"; + sha512 = "aEtMhrH5ww3X6RgbsNcwu0whw8zjOoeRnwPqRKqKuxWS5KlAZhCY+rTm6wMlHOXbxmLGn8lW6Xox7rfpBExzGA=="; }; }; "event-target-shim-5.0.1" = { @@ -535,13 +535,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "glob-7.1.6" = { + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "graceful-fs-4.2.6" = { @@ -715,22 +715,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.46.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.46.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz"; - sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.29" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.29"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; - sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "minimatch-3.0.4" = { @@ -895,13 +895,13 @@ let sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g=="; }; }; - "polyfill-library-3.103.0" = { + "polyfill-library-3.107.1" = { name = "polyfill-library"; packageName = "polyfill-library"; - version = "3.103.0"; + version = "3.107.1"; src = fetchurl { - url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz"; - sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg=="; + url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.107.1.tgz"; + sha512 = "HrN61Tp8Wjz1xcmYmstm0m6ySeiVSVqadDFhFMZmoiWlRoPQRfdeVWv88IqZKmxYITZ85z26wmOJdGYrGs6tjw=="; }; }; "process-nextick-args-2.0.1" = { @@ -985,13 +985,13 @@ let sha512 = "emnwZtu6NrlBlvT6HrlbAOs024JX4orWew8H5owBOyUJ7eFXn8lGe4bsXTBD6AAWzP/p7LL86AjVIH8Apqec5w=="; }; }; - "semver-7.3.4" = { + "semver-7.3.5" = { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; "send-0.17.1" = { @@ -1021,22 +1021,22 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "socket.io-3.1.2" = { + "socket.io-4.1.3" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; - sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; }; - "socket.io-adapter-2.1.0" = { + "socket.io-adapter-2.3.1" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz"; - sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz"; + sha512 = "8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw=="; }; }; "socket.io-parser-4.0.4" = { @@ -1075,6 +1075,15 @@ let sha512 = "BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw=="; }; }; + "statsd-client-0.4.7" = { + name = "statsd-client"; + packageName = "statsd-client"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz"; + sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -1084,15 +1093,6 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "stream-cache-0.0.2" = { - name = "stream-cache"; - packageName = "stream-cache"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz"; - sha1 = "1ac5ad6832428ca55667dbdee395dad4e6db118f"; - }; - }; "stream-from-promise-1.0.0" = { name = "stream-from-promise"; packageName = "stream-from-promise"; @@ -1138,13 +1138,13 @@ let sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; }; - "tslib-2.1.0" = { + "tslib-2.3.0" = { name = "tslib"; packageName = "tslib"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; - sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; }; }; "uglify-js-2.8.29" = { @@ -1156,13 +1156,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.13.0" = { + "uglify-js-3.14.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz"; - sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.1.tgz"; + sha512 = "JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -1273,13 +1273,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.3" = { + "ws-7.4.6" = { name = "ws"; packageName = "ws"; - version = "7.4.3"; + version = "7.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; - sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"; + sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; }; "yaku-1.0.1" = { @@ -1312,33 +1312,33 @@ let }; in { - "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.9.1" = nodeEnv.buildNodePackage { + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.14.6" = nodeEnv.buildNodePackage { name = "whitebophir"; packageName = "whitebophir"; - version = "1.9.1"; + version = "1.14.6"; src = fetchgit { url = "https://github.com/lovasoa/whitebophir.git"; - rev = "626397d43f14c3579d6434ac76fc373b994f1741"; - sha256 = "3c3d74b7c011e1d0f2781210de996fc0ecc35b29b93c74a27eb436902d0489fe"; + rev = "37d1d6811af911739d57520dc20dae6cac154464"; + sha256 = "bda4e0077ef64861146e073c91b7488edfc0290f37478da6563e9ea16e6e4824"; }; dependencies = [ - sources."@financial-times/polyfill-useragent-normaliser-1.9.0" - sources."@financial-times/useragent_parser-1.5.1" - sources."@formatjs/ecma402-abstract-1.5.1" - sources."@formatjs/intl-datetimeformat-3.2.3" - sources."@formatjs/intl-displaynames-4.0.4" - sources."@formatjs/intl-getcanonicallocales-1.5.3" - sources."@formatjs/intl-listformat-5.0.4" - sources."@formatjs/intl-locale-2.4.13" - sources."@formatjs/intl-numberformat-6.1.3" - sources."@formatjs/intl-pluralrules-4.0.5" - sources."@formatjs/intl-relativetimeformat-8.0.3" - sources."@juggle/resize-observer-3.3.0" + sources."@financial-times/polyfill-useragent-normaliser-1.10.0" + sources."@financial-times/useragent_parser-1.6.0" + sources."@formatjs/ecma402-abstract-1.8.0" + sources."@formatjs/intl-datetimeformat-4.1.0" + sources."@formatjs/intl-displaynames-5.1.0" + sources."@formatjs/intl-getcanonicallocales-1.6.0" + sources."@formatjs/intl-listformat-6.1.0" + sources."@formatjs/intl-locale-2.4.26" + sources."@formatjs/intl-numberformat-7.1.0" + sources."@formatjs/intl-pluralrules-4.0.20" + sources."@formatjs/intl-relativetimeformat-9.1.0" + sources."@juggle/resize-observer-3.3.1" sources."@types/component-emitter-1.2.10" - sources."@types/cookie-0.4.0" - sources."@types/cors-2.8.10" - sources."@types/node-14.14.31" - sources."@webcomponents/template-1.4.4" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/node-16.4.11" + sources."@webcomponents/template-1.5.0" sources."Base64-1.1.0" sources."abort-controller-3.0.0" sources."accept-language-parser-1.5.0" @@ -1346,7 +1346,7 @@ in sources."align-text-0.1.4" sources."async-mutex-0.3.1" sources."audio-context-polyfill-1.0.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."brace-expansion-1.1.11" @@ -1372,7 +1372,7 @@ in sources."diff-4.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-4.1.1" // { + (sources."engine.io-5.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -1381,14 +1381,14 @@ in sources."engine.io-parser-4.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-source-polyfill-1.0.22" + sources."event-source-polyfill-1.0.24" sources."event-target-shim-5.0.1" sources."fastestsmallesttextencoderdecoder-1.0.22" sources."fresh-0.5.2" sources."from2-2.3.0" sources."from2-string-1.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."graceful-fs-4.2.6" sources."handlebars-4.7.7" sources."html5shiv-3.7.3" @@ -1408,8 +1408,8 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" @@ -1425,7 +1425,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."picturefill-3.0.3" - (sources."polyfill-library-3.103.0" // { + (sources."polyfill-library-3.107.1" // { dependencies = [ sources."source-map-0.5.7" sources."uglify-js-2.8.29" @@ -1440,7 +1440,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."seamless-scroll-polyfill-1.2.3" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -1453,13 +1453,13 @@ in }) sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.2" // { + (sources."socket.io-4.1.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.1.0" + sources."socket.io-adapter-2.3.1" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -1468,15 +1468,15 @@ in }) sources."source-map-0.6.1" sources."spdx-licenses-1.0.0" + sources."statsd-client-0.4.7" sources."statuses-1.5.0" - sources."stream-cache-0.0.2" sources."stream-from-promise-1.0.0" sources."stream-to-string-1.2.0" sources."string_decoder-1.1.1" sources."toidentifier-1.0.0" sources."toposort-2.0.2" - sources."tslib-2.1.0" - sources."uglify-js-3.13.0" + sources."tslib-2.3.0" + sources."uglify-js-3.14.1" sources."uglify-to-browserify-1.0.2" sources."unorm-1.6.0" sources."usertiming-0.1.8" @@ -1488,7 +1488,7 @@ in sources."window-size-0.1.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.6" sources."yaku-1.0.1" sources."yallist-4.0.0" sources."yargs-3.10.0" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json index 7ba8afd151..72eabcc7ec 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -1,3 +1,3 @@ [ - { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.9.1" } + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.14.6" } ] diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index b7fa5453d8..eb3d61dc66 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -4,6 +4,7 @@ , rustPlatform , openssl , zlib +, zstd , pkg-config , python3 , xorg @@ -17,27 +18,40 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Asjm3IoAfzphITLQuNh6r/i/pjEM/A+wpCsAB83bu2U="; + sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337"; }; - cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; + cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; - buildInputs = [ openssl ] + buildInputs = [ openssl zstd ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; + # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and + # `parquet`, for dataframe support), which by default has an impure build + # (git submodule for the `zstd` C library). The `pkg-config` feature flag + # fixes this, but it's hard to invoke this in the right place, because of + # the indirect dependencies. So add a direct dependency on `zstd-sys` here + # at the top level, along with this feature flag, to ensure that when + # `zstd-sys` is transitively invoked, it triggers a pure build using the + # system `zstd` library provided above. + # + # (If this patch needs updating, in a nushell repo add the zstd-sys line to + # Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.) + cargoPatches = [ ./use-system-zstd-lib.diff ]; + # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths # outside of TMPDIR diff --git a/third_party/nixpkgs/pkgs/shells/nushell/use-system-zstd-lib.diff b/third_party/nixpkgs/pkgs/shells/nushell/use-system-zstd-lib.diff new file mode 100644 index 0000000000..271ad6c692 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/nushell/use-system-zstd-lib.diff @@ -0,0 +1,32 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 8833c3e5..0c90d2fe 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3188,6 +3188,7 @@ dependencies = [ + "nu_plugin_xpath", + "rstest", + "serial_test", ++ "zstd-sys", + ] + + [[package]] +@@ -6954,4 +6955,5 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 89e8a311..4cc2331a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -63,6 +63,9 @@ serial_test = "0.5.1" + hamcrest2 = "0.3.0" + rstest = "0.10.0" + ++# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library ++zstd-sys = { version = "1", features = [ "pkg-config" ] } ++ + [build-dependencies] + + [features] diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index ac62ad3082..ba3c8eef20 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -231,6 +231,7 @@ let timeout = int; # Weirder stuff that doesn't appear in the documentation? + maxSilent = int; knownVulnerabilities = listOf str; name = str; version = str; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xplugd/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xplugd/default.nix new file mode 100644 index 0000000000..aa07c7f37b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/xplugd/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, xorg +, pkg-config +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "xplugd"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "xplugd"; + rev = "v${version}"; + sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql"; + }; + + buildInputs = with xorg; [ libX11 libXi libXrandr libXext ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = with lib; { + homepage = "https://github.com/troglobit/xplugd"; + description = "A UNIX daemon that executes a script on X input and RandR changes"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ akho ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix index 83d4387bd3..efa565bc3e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme.sh/default.nix @@ -2,13 +2,13 @@ unixtools, dnsutils, coreutils, gnugrep, gnused }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.9.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk="; + sha256 = "sha256-KWSDAHzvNl8Iao13OV/ExRoKqkc9nouWim+bAN1V+Jo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index 0298ca29a7..b0765d852c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E04G3EJ0JrOVjtTd3nBHZehzuDrvt6t4hfFdGO92uuk="; + sha256 = "sha256-eeNJ6oQayPBOHKsFrr2JbdLSv3R7N1xW3lV4LgVpUI4="; }; - vendorSha256 = "sha256-xgP5IhB9eyKOIBlT5jKDJkUy8lz2UrWmGqqeDhqRawY="; + vendorSha256 = "sha256-79+j/+X9DQBpUvZuyQCSaoy1f4UnkERh54zmo4AhGwc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 81585c9247..a51d33735b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-qSZos1BO48Z5aiay8B/9DFGPgAOC8ib7IRjlFhzFh5Y="; + sha256 = "sha256-zRwdluwVi4hbDZGlRwhNWkeq05c2VTZ52KrxvyFIBio="; }; vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; @@ -17,10 +17,10 @@ buildGoModule rec { subPackages = [ "cmd/eksctl" ]; - buildFlags = [ "-tags netgo" "-tags release" ]; + tags = [ "netgo" "release" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" + ldflags = [ + "-s" "-w" "-X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev}" "-X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index ac831c9da4..722e3b9477 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.16"; + version = "4.17"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r"; + sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl"; }; postPatch = '' @@ -72,7 +72,7 @@ buildGoPackage rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz wucke13 ]; + maintainers = with maintainers; [ fpletz wucke13 marsam ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index 99627b930c..d874dea286 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.6.0"; + version = "3.9.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-linux-x64.tar.gz"; - sha256 = "1phj65y1l6pllq5fyrxm7hrwg44jpzq1skq6dw7x6zrs8prnlj52"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-linux-x64.tar.gz"; + sha256 = "0gxi3zi6scfl9d3b26q7i1f6z39q9npqgik0cgb178an0ygpk3w5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-linux-amd64.tar.gz"; - sha256 = "12fj43pcs64s0i6h05q94abbxi0r1rlh8qgycmmydr8wajsn2a54"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-linux-amd64.tar.gz"; + sha256 = "0sk2qmyw7cchlyqrzq2ny516iq9qxh2ywiql8111c5ph2kx8m7az"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-linux-amd64.tar.gz"; - sha256 = "1xvbkvhny8h5yl6gvlgzdp0cd8xv39sxm36bfszvx9133p6spvy4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1w626m38qr0qa9ccpb3f6wdggk3dridqh3jnx9z1zf6bdg2vspa1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.1-linux-amd64.tar.gz"; - sha256 = "1zng8w2jr76z9s95id9dnvw7skr4yd55xrvv9c053gpyh7wv7bhs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-linux-amd64.tar.gz"; + sha256 = "0pdizb132a7r9n07hqmhrz57hhpmggvgbnmcc87xlpbzc5b72sin"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,8 +41,8 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-linux-amd64.tar.gz"; - sha256 = "0h0dpbdc9rcagw0wgz5l6jjc8wl1hj5ki5shi44jyf4hz7l0yl9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-linux-amd64.tar.gz"; + sha256 = "1xdldrsgh52lffbkxwc865qllr5sd9hsqksl55v0gm55acqh8jhd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz"; @@ -53,12 +53,12 @@ sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-linux-amd64.tar.gz"; - sha256 = "0al3578g7l9rvhkswlm56wpkybj6njj39a3g56in9882lhpqixsy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-linux-amd64.tar.gz"; + sha256 = "03475c9qhd5wb174xnzi84dj74zf1fy2i43d5b7911w09mdqrzb6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-linux-amd64.tar.gz"; - sha256 = "1zi6r1g7l56ra506hxkj8p9wlkgbmry7ir48v8wwdsfvplryj4sf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-linux-amd64.tar.gz"; + sha256 = "09jf18fmdvgnhx8nx5zbpyc8xgh0zr8w50z463vy4h62r3xyafs5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz"; @@ -89,30 +89,30 @@ sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-linux-amd64.tar.gz"; - sha256 = "0npszs37q6j1x5h2sp9j1c6qnhr03lxp2r2ci0d4z3x7vyk06rja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-linux-amd64.tar.gz"; + sha256 = "1jvq530gz7bjcljlb3y6yvgfj1fgksgcxs48vl2j6xzyl6y56f6g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.0-linux-amd64.tar.gz"; - sha256 = "09vf4jddy7bys6x2vw7cyq5ylnwb43rr3ysk3vvi5czpbb8fa86k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; + sha256 = "0xrq4ffkaa0z5w2g7b9fdll3sh8wpzd6fg0xay7hfzjnl65dl3mp"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-darwin-x64.tar.gz"; - sha256 = "0yql94y78q0hfsxfsgvkxs7dv2lgrkv4ypm59qjr8l04krcknbmm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.9.0-darwin-x64.tar.gz"; + sha256 = "11smw4vy4pzy56smw2mkdaxs2ymkgq9zkhrlq512nx4xh3z46aiv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "0zv4b7nyvz7h0h0jxndd7dxzf4risgqyl7f20cbbcsixxk90sz38"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "1fdqp3lhqsm06crbwvyq5qbxy97n432mcnyqcrsd5202yyk6dzbs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1h726ahb6mqzg83fl3m8wck5gz5hxczbpwmb5xl0yzz1m0s54czf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "1h5rvwy4mdb8566nj4hkxnfva77xrj33y7sxssk7y9gi6k0yx7qa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; @@ -123,8 +123,8 @@ sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.4.1-darwin-amd64.tar.gz"; - sha256 = "14kjmzmi5v5brz1cphpgr5k8clkr25vrc7wi8v36qmdhigv0kfbn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.5.0-darwin-amd64.tar.gz"; + sha256 = "0ww91jbi9z8qf0n820h6bx60x2jp4hvwy0aazw37392aczz1kz6d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,8 +135,8 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-darwin-amd64.tar.gz"; - sha256 = "1k7yxajx3157qdanw1y11053k74rwlcvh828xrpwkzqszmzizxp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.13.0-darwin-amd64.tar.gz"; + sha256 = "036msa4h2s5glyfh58kgnimzkiyq4m2k8vhq20wj5mgzpza4gp8v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz"; @@ -147,12 +147,12 @@ sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-darwin-amd64.tar.gz"; - sha256 = "1fgh7q7sivip212q2zgvrgg3lwxrzasm9vpa858168fvjv67ylbc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.1-darwin-amd64.tar.gz"; + sha256 = "02pfb2j5wsvz0mc99sqpv7fkg00drdmi8bwzvwkg3gr1kqlgvjbv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "0cl8wg5g78c147pqy5q52qq9bd7hw8zgvfmdafszwzwz6xh1051b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "1ddz2lh8sz4zy5dzwxnzq32ln9y24dx1b8pvkx8h66z3n0dwa368"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz"; @@ -183,12 +183,12 @@ sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "0nasbip85f1xjp6dfibw0nh133gf9cy5n4gdqnv5759bg92am7kg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0cg806zpax6q69nr9gdnj00i5lqfh5ljs62181m8jrpczdaryxcn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "09m0p5k8gkz37193vj1kwkdwbcvv04cwangwbp5xcn3c20q467xb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; + sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3"; } ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index efde5e7d66..dc603283ad 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -3,24 +3,24 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.6.0" +VERSION="3.9.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( "auth0=2.2.0" - "aws=4.10.0" - "cloudflare=3.2.0" + "aws=4.14.0" + "cloudflare=3.3.0" "consul=3.2.0" "datadog=3.3.0" - "digitalocean=4.4.1" + "digitalocean=4.5.0" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.11.0" + "gcp=5.13.0" "github=4.2.0" "gitlab=4.1.0" - "hcloud=1.1.0" - "kubernetes=3.5.0" + "hcloud=1.1.1" + "kubernetes=3.5.1" "linode=3.2.0" "mailgun=3.1.0" "mysql=3.0.0" @@ -28,8 +28,8 @@ plugins=( "packet=3.2.2" "postgresql=3.1.0" "random=4.2.0" - "vault=4.1.0" - "vsphere=4.0.0" + "vault=4.2.0" + "vsphere=4.0.1" ) function genMainSrc() { diff --git a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix index e9be1c8300..e184810a29 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { subPackages = [ "main/pg" ]; - buildFlagsArray = [ - "-tags=brotli libsodium" - "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" - ]; + tags = [ "brotli" "libsodium" ]; + + ldflags = [ "-s" "-w" "-X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version}" "-X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ]; postInstall = '' mv $out/bin/pg $out/bin/wal-g diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 0939584fa9..528f0999b2 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw"; + sha256 = "sha256-Ge1ZsaE09YT8AF9HKV/vZAqXCf2bmyMHOI4RKjLs0PY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index 92d35338d1..759104b9c0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.35.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-A6vhdECKMq0kcR7mUTPu9F0N7gVj7tOg7UXeJ/gmbnM="; + sha256 = "sha256-qsvHqSvMG7VwRtNmyun2oO+ZRZ1D1spefTeUXrWGSNk="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix index 24acbfb734..fad140d745 100644 --- a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-Jn+CCUUGVa6YTD3af4bkY1wlJ4gAPOzxOwgfNx6VHL0="; + sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70="; }; - cargoSha256 = "sha256-7XMcZHezqk4g7FPgFCnMhbjJsJE8QkfzbtujUsV7GUw="; + cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo="; nativeBuildInputs = [ autoPatchelfHook @@ -59,6 +59,7 @@ in rustPlatform.buildRustPackage rec { openssl libxcb libX11 + libxkbcommon ]; fixupPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index 17a79cda81..bd15661a0e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "2.1.0-dev-20210729"; + version = "2.1.0-dev-20210804"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-CrGZf+EiJfgPYOdz7NYSc6B/hpVpgNMCdRl1jd/nJ2o="; + sha256 = "sha256-ptxESGdgGus4ZfCvpOYCcURdPSLZEFq3iYy/MmetJCU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 623c29124f..0785b75634 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.6.9"; + version = "0.7.0"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU="; + sha256 = "sha256-WKNDrm8PSU/F8MzpVsJ9oUkbolCxrwbjOZYYNiFr5Qs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix index 90abc76592..d65d31d44c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.36"; + version = "3.2.39"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; + sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix index 7f57cab585..7405535edd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.0"; + version = "3.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; + sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 8bca39c2ad..9ff6a7aaa9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qarmin"; repo = pname; rev = version; - sha256 = "sha256-LtGgpfToQUNKM1hmMPW7UrS/n7iyI+dz2vbSo+GOcRg="; + sha256 = "sha256-OBe6nk5C3kO5Lkas9+G+VY3xAzY7SWx8W5CkSbaYJ9Y="; }; - cargoSha256 = "sha256-ZbyoCo1n4GRBkb5SClby5V51rLN1PnvCHD30TiJU2gY="; + cargoSha256 = "sha256-Jghkf1mX5ic7zB2KmtOZbSxgF8C6KjRdGG1Yt+dzylI="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index d804b5200d..069343b8a4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "179"; + version = "180"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4="; + sha256 = "sha256-P6u+5MwnJ4xQ955qdX1I/ujRCcgyCXjXDXvvpUbhqt8="; }; outputs = [ "out" "man" ]; @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: docx2txt dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon + # Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon pythonPath = [ binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index 058a0d1ad6..1fd1d3422a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "diskonaut"; @@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "10jrcy8m9ll4136ghq3fhmnphd9g3rw863x708vm17n44kgdxyab"; + # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Terminal disk space navigator"; homepage = "https://github.com/imsnif/diskonaut"; license = licenses.mit; - maintainers = with maintainers; [ evanjs ]; + maintainers = with maintainers; [ evanjs SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix index d0fae336d9..6834179cfe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/etcher/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace /opt/balenaEtcher/balena-etcher-electron ${pname} + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index e46b8fe04d..f4b32d70eb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JuOhJGszsEBBz9G4jjV7OhCAyrSOIktYgoDpYPMk21c="; + sha256 = "sha256-2jj5sWnkc8Jl9Hdm9NqtA0icg/4busXTn5bsqW2u8es="; }; - cargoSha256 = "sha256-rKSbsxFt+ntE68eQK6zbIPdOL9JBOgqyqLnb8paVVo0="; + cargoSha256 = "sha256-7+BdljkmaT/09PUIa10rZ5Ox2VRZR40zoauDzVxMjQM="; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix index cc56205243..108cc5b82f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] - ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; + maintainers = with maintainers; [ ]; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix index 17e67c0bc7..b5d884dbac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.2"; + version = "5.4.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; + sha256 = "sha256-/FhOZ6WCaQQOzsLH3iZTnwzmwUcdsskgASJFZupSIY0="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix index 8d18d654c7..729cfbc283 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "4.0.7"; + version = "3.3.14"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "sha256-sZn/ug4oh/SHbICbiQeAmtEIwT3++DBWbT2XBkYGYUc="; + sha256 = "04dslbvgrraacsw7wydbiv8jc753as2g54wn9sgh3lsryvzrfqfa"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix index e47ea74bbe..bb44c800a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grc/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "grc"; - version = "1.12"; + version = "1.13"; format = "other"; src = fetchFromGitHub { owner = "garabik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XJj1j6sDt0iL3U6uMbB1j0OfpXRdP+x66gc6sKxrQIA="; + sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix index 8537e5748c..b33fee8e0b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdfview/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdfview"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; - sha256 = "0kyw9i3f817z71l0ak7shl0wqxasz9h5fl05mklyapa7cj27637c"; + sha256 = "sha256-VmgHSVMFoy09plU5pSnyaPz8N15toy7QfCtXI7mqDGY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix index 690fbe8abc..ffa2c3408b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.41"; + name = "t1utils-1.42"; src = fetchurl { url = "https://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; + sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix index f47a5808d0..30d00eb74d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tagref/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "0y1c0v2zjpav1n72pgf3kpqdz6ixp2mjhcvvza4gzfp865c236nc"; + sha256 = "sha256-PZ5ymYXn19PnvimofODh6su9zHdVoa3T7RCWPSO1Z6w="; }; - cargoSha256 = "0ca6maapn2337i78mq97199xjqk87ckw14k8kspc8kx5wnics2hl"; + cargoSha256 = "sha256-6siqfAWFoOomqcRvW+iku28FbyKCHiDzMVIUwWP8hJM="; meta = with lib; { description = "Tagref helps you refer to other locations in your codebase."; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 71f2ad3e95..392b03f21a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-DFFA6t+ZgpGieq5kT80PW5ZSByIp54ia2UvcBYY2+Lg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] - ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix index 2069ba6b15..77491f22f9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA="; + sha256 = "sha256-P22DMmR+z2kl05SkOsbjFHFz9I5cu4W6EaYLpd1a0mg="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index 233c57bc63..ebb816b188 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; + # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' @@ -26,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/imsnif/bandwhich"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ma27 ]; + maintainers = with maintainers; [ Br1ght0ne ma27 SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 5c9abf5789..925587ae93 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.4.0"; + version = "0.5.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU="; - aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ="; - x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI="; + x86_64-linux = "sha256-5ggbM6Ev4TkpyG0yPGCh22QSqefyO32Q2k2kthHgkTc="; + aarch64-linux = "sha256-oboMI2OxemIEX+IcBkN/DoACGXzyxsxHg4OD3ugbLR0="; + x86_64-darwin = "sha256-dpSI7I37vChljHSV0mwUDymngIFoQ5sWAszJ9MePMG8="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 53d1a3d4f2..abe5325af0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.6"; + version = "2021.8"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-DPUi/KRnJkwrc7KMq10+LE6+MX9yJLgrgIHKhlfL+vc="; + sha256 = "sha256-IiuwPag4045X9MaXhCNyGhJQi1302ciLfGfNlC0zO0w="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 001ee1c725..485ce66dbd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.2.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEgR/4t2NRqdlAtHS41sACSNZpDY+4IEaeftCgRpEEk="; + sha256 = "sha256-pEW20IbPVywNq2udfdQ/U71aDEku73+JGiy2iRADJ8Y="; }; - vendorSha256 = "sha256-YwMqIbxj6ldYBjLb3Gs96oOHM2Li4Qq8PEMeYtrcSnE="; + vendorSha256 = "sha256-z5G56PiBisceNc4tfZJVKh9tZmUkyamQBYG2mQ6kuXg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index f42294974c..3debf67f81 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.0"; + version = "0.39.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rHU07rh8wZPaaxZmXVBu4tpt02Jq7Yu//dwWeVDUpw4="; + sha256 = "sha256-FuPNWoLsqPvz4J+ymfEKBjPmLlxwDUp/196REDnGPmQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 2db99bfa82..79ae5a9713 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "eggheads"; repo = "eggdrop"; rev = "v${version}"; - sha256 = "0xqdrv4ydxw72a740lkmpg3fs7ldicaf08b0sfqdyaj7cq8l5x5l"; + sha256 = "sha256-vh8nym7aYeTRUQ7FBZRy4ToG2ajwRDhzi4jNiJQOEyQ="; }; buildInputs = [ tcl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 871dd5ee5b..1fc91277ef 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ="; + sha256 = "sha256-TEVSxTzMgoIPcIUmhtRnFSp3xClJmOsIUjpKEr5sId8="; }; - vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM="; + vendorSha256 = "sha256-4vvIobj1I7FbPVJJG4NZogwv4BMo7GRa5Fo5gO2Daws="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gftp/default.nix deleted file mode 100644 index ab956a45b4..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/gftp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: - -stdenv.mkDerivation rec { - pname = "gftp"; - version = "2.0.19"; - - src = fetchurl { - url = "https://www.gftp.org/gftp-${version}.tar.bz2"; - sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; - }; - - postPatch = '' - sed -i -e '//d' lib/pty.c - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 readline ncurses gettext openssl ]; - - meta = { - description = "GTK-based FTP client"; - homepage = "http://www.gftp.org"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 47d8661502..7a3ee1e012 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.7"; + version = "2.8.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; + sha256 = "sha256-kr9xh7HMikargi0hhj3epH2c6R5lN4qD9nDaChNI4Kg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index b6fce962d7..e224cc33a0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI="; + sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 054b77f8c9..2482c17499 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which }: +, hcxdumptool, pyrit, which, bully }: python3.pkgs.buildPythonApplication rec { - version = "2.5.5"; + version = "2.5.7"; pname = "wifite2"; src = fetchFromGitHub { owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "0rh54gj471dn8442imxwasjrrwzsx4m40nylkw3y6p8rbjmb92h4"; + sha256 = "sha256-dJ+UOSIR48m8nGoci/6iblLsX296ZGL1hZ74RUsa9lw="; }; patches = [ @@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { wirelesstools pyrit which + bully ]; postFixup = let diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 5972d781bd..416731eb8d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 d-xo ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix index 26731817c8..5abe4ea096 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.15"; + version = "1.3.16"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0ppwza8nwm1av1vldw40gin9wrjrs4l9si50jad414js3k8ycaag"; + sha256 = "sha256-1Hipek50qjcr0vgTNr4PQyCf1qLZ3UKqu+DLuDNjRUc="; }; buildInputs = [ libpcap ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix index 216e2678e2..9137e5a716 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix @@ -8,5 +8,6 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.lgpl2Plus; maintainers = with maintainers; [ chkno ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix index 75f47d35ce..bd16ecc6f3 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -1,21 +1,29 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, makeWrapper, openssh, nix-serve }: rustPlatform.buildRustPackage rec { pname = "nix-simple-deploy"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "misuzu"; repo = pname; rev = version; - sha256 = "12g0sbgs2dfnk0agp1kagfi1yhk26ga98zygxxrjhjxrqb2n5w80"; + sha256 = "0vkgs3ffb5vdzhrqdnd54vbi36vrgd3408zvjn0rmqlnwi3wwhnk"; }; - cargoSha256 = "1wp8wdv25j8ybq2j04z3nl4yc95wkj5h740lzpyps08yaxj8bncr"; + cargoSha256 = "0z4d4cazl6qvigyqzdayxqfjc1ki1rhrpm76agc8lkrxrvhyay2h"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/nix-simple-deploy" \ + --prefix PATH : "${lib.makeBinPath [ openssh nix-serve ]}" + ''; meta = with lib; { description = "Deploy software or an entire NixOS system configuration to another NixOS system"; homepage = "https://github.com/misuzu/nix-simple-deploy"; + platforms = platforms.unix; license = with licenses; [ asl20 /* OR */ mit ]; maintainers = with maintainers; [ misuzu ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 363abbd395..88002fc1ce 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -13,9 +13,9 @@ buildGoPackage rec { sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8="; }; - buildFlags = [ "--tags" "release" ]; + tags = [ "release" ]; - buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; + ldflags = [ "-X main.Version=${version}" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libiconv ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index 344c74d573..f5f60f3da2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -21,9 +21,8 @@ buildGoModule rec { excludedPackages = "\\(copasetic\\)"; - preBuild = '' - buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) - ''; + tags = lib.optionals pivKeySupport [ "pivkey" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index b63b12aca0..2f23d218c4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-ti49b03Ta/MVDNIzW1WhWxJqHNVW9EALUcbElcZvurQ="; + sha256 = "sha256-PJLiP8o4HMkaHMrsnObpUdGtKLxIuXZhxva34U26i40="; }; - cargoSha256 = "sha256-jF1Ozo5q5cKG9KjR1scbCCofG3FT3Fv98Cj0iOl18+c="; + cargoSha256 = "sha256-6fHMchoJO5Tss6kFTulDmI4aXS3YF5k6RqEWQbh5mNc="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix index 3032c18427..7a19a439a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keybase/gui.nix @@ -4,17 +4,17 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20210125164223.f3b21527b9"; + versionSuffix = "20210623205749.763227b4c6"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.7.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p"; + sha256 = "0ajpkidbzfwhi7q018wriws0n3amcy9g3mfiqm13cpz0q6vkjx83"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix b/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix index 094aab1e86..fbca5633fc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-IJCLj3iSPkfkYOqTu7adtU26jTgKfRmiwIfKvSApdIY="; + sha256 = "sha256-RIz0GTuw3QJKSk25zl4c34o+HgMkpclzoPEbzKhCNqg="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index d9ca1bb29a..5af7eca138 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.55" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.56" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index eb3c1b2ee0..6fd30d8d6a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: bdf054bcc84e23bba81c387cc9247bf3c4052afb - ref: refs/tags/6.0.55 + revision: d818269c546bd165c29652768cd2058fcb56c4fa + ref: refs/tags/6.0.56 specs: - metasploit-framework (6.0.55) + metasploit-framework (6.0.56) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,7 +31,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.48) + metasploit-payloads (= 2.0.50) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.10) mqtt @@ -127,7 +127,7 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.482.0) + aws-partitions (1.484.0) aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -174,7 +174,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.5.1) + faraday (1.6.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -182,6 +182,7 @@ GEM faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -191,6 +192,7 @@ GEM faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) + faraday-rack (1.0.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) @@ -210,7 +212,7 @@ GEM jsobfu (0.4.2) rkelly-remix json (2.5.1) - loofah (2.10.0) + loofah (2.11.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -232,7 +234,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.48) + metasploit-payloads (2.0.50) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -245,7 +247,7 @@ GEM webrick metasploit_payloads-mettle (1.0.10) method_source (1.0.0) - mini_portile2 (2.5.3) + mini_portile2 (2.6.1) minitest (5.14.4) mqtt (0.5.0) msgpack (1.4.2) @@ -257,9 +259,9 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.3.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.2) + mini_portile2 (~> 2.6.1) racc (~> 1.4) octokit (4.21.0) faraday (>= 0.9) @@ -300,7 +302,7 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.6) rb-readline (0.5.5) - recog (2.3.20) + recog (2.3.21) nokogiri redcarpet (3.5.1) reline (0.2.5) @@ -343,7 +345,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.29) + rex-socket (0.1.32) rex-core rex-sslscan (0.1.6) rex-core diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index c0a4d58574..ee10319592 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.55"; + version = "6.0.56"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-Wf6Aj/mYHs7KdAYWjNzoD+Q5xK9DOsPiRTIEY7lac8M="; + sha256 = "sha256-FQxxQ4Lsoktl/Ld+nvBNHCTsZ3PFDQ4GEMrh/CMZrZ0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 0295e7a5c6..77b2468886 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14l1w0ka4r54rx18c856dpn5dg1fnqlriiscjj89ap6vzg8r5pl4"; + sha256 = "012hf08bmzmk2sjynrgzfg0ssa26fkvjm47ixjnmb9byrqmh3mwr"; type = "gem"; }; - version = "1.482.0"; + version = "1.484.0"; }; aws-sdk-core = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; + sha256 = "0xmi0yl9sniicvyh2k437dicvvzkryrc1ckr8dic84a98bbl32gy"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; faraday-em_http = { groups = ["default"]; @@ -429,6 +429,16 @@ }; version = "1.0.0"; }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; faye-websocket = { groups = ["default"]; platforms = []; @@ -554,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; + sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.0"; }; metasm = { groups = ["default"]; @@ -594,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "bdf054bcc84e23bba81c387cc9247bf3c4052afb"; - sha256 = "1hvkbawn611j8pic6fj3mz23kr0gx3f8q5h6fk5cw7lqz67q1zjr"; + rev = "d818269c546bd165c29652768cd2058fcb56c4fa"; + sha256 = "17dd34izrqfa2030w3f5fdkyq90w9pq9wzmpzijlp8pch91p230m"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.55"; + version = "6.0.56"; }; metasploit-model = { groups = ["default"]; @@ -616,10 +626,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jg96v1a7q3ypq33jaflnfvpqm6cz0ihaiilag2y6qvd0ypv297d"; + sha256 = "1wn6whvisps6fxd5fqbf6rr6znc3miqn8dwk3x8a6aycffphc75j"; type = "gem"; }; - version = "2.0.48"; + version = "2.0.50"; }; metasploit_data_models = { groups = ["default"]; @@ -656,10 +666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; type = "gem"; }; - version = "2.5.3"; + version = "2.6.1"; }; minitest = { groups = ["default"]; @@ -766,20 +776,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; type = "gem"; }; - version = "2.5.7"; + version = "2.5.8"; }; nokogiri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "1iav4jrklvm8938bxhby0khs36mdndhvwia4hc85zxcb0yl1k8ll"; type = "gem"; }; - version = "1.11.7"; + version = "1.12.2"; }; octokit = { groups = ["default"]; @@ -986,10 +996,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hc55mdl2d4kb8vrbazydxdnzr5l7dd4v5spqrrgnmp2d7rq3az"; + sha256 = "0ndzawr0rd3jdizxgjyrgipi3ccn9jpagvplxk91kb5spy9lnsy2"; type = "gem"; }; - version = "2.3.20"; + version = "2.3.21"; }; redcarpet = { groups = ["default"]; @@ -1146,10 +1156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ar9vm8pwjz7c11kr3pjnxbgk68f2i5k1r9j3r34pfq9n26s79gr"; + sha256 = "03cvgmg0wswqcr70mhc6802vvgcg62f7vkbj0i7sskgy3cl9lryx"; type = "gem"; }; - version = "0.1.29"; + version = "0.1.32"; }; rex-sslscan = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix new file mode 100644 index 0000000000..e264914157 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/scorecard/default.nix @@ -0,0 +1,53 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "scorecard"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "ossf"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OUQzgTQbeQfut/ATvUl9RTFZISiGaUhRjZi4Rh7BB2A="; + }; + vendorSha256 = "sha256-/Ltw0qZkLr1qaQixLy5pvWZiNRJucp+bDiY7yVlWmqA="; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" "-X github.com/ossf/scorecard/v2/cmd.gitVersion=v${version}" ]; + + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + # Feed in all but the e2e tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + getGoDirs() { + go list ./... | grep -v e2e + } + ''; + + postInstall = '' + installShellCompletion --cmd scorecard \ + --bash <($out/bin/scorecard completion bash) \ + --fish <($out/bin/scorecard completion fish) \ + --zsh <($out/bin/scorecard completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/scorecard --help + $out/bin/scorecard version | grep "v${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/ossf/scorecard"; + changelog = "https://github.com/ossf/scorecard/releases/tag/v${version}"; + description = "Security health metrics for Open Source"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 346141ca89..b1d7ec6bc2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-jyGymAplSe8vaSwbONtpRoAondxNBcRbFZ+YyOtr7qo="; + sha256 = "sha256-zBUUhHecf3jn9HSoydsKBQLXtfsVb56RbECg7zteZzc="; }; - vendorSha256 = "11mrdf7pwf8v7bb7wamv2yhixw4x06rd0qym942kk9bwif2balfp"; + vendorSha256 = "sha256-uuzcDsi3f8KWE8WtN9v4jqmZPWsOm5I2LAbsyj1sjOY="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index c2f0c2ea51..52d0f261d4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.0"; + version = "1.8.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-H+kPDE8xuu2lgENf4t+vCb+Tni+ChkB8K5ZEgIY3Jyo="; + sha256 = "sha256-u0EfK7rXnC5PBkDx09XvUOK9p9T0CHWlaRfJX/eDwts="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "19c7d7yr5nm1xgrkh46pcgwwxa6iic6is06n343qaxcj0dfg43kn"; + sha256 = "11khjx5lrb7zmrahkniqwn4ad98yjy2fm0miz63nzpq85c0yrjdn"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0zql0r6gmq0yqb1cbpjgwsg6cky9y43n5gsvijp6snhnp86bicdr"; + sha256 = "02gqavhg3pk6jkdmn1yp9pl3pv4ni2sg56q218gs8gbbypj22wpq"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1ajkgkanq8ijcxbb5zbn9z25r0v7qcq13ivjqr0x7ql5bxm3xfmc"; + sha256 = "0500nc8v7hwnrckz4fkf5fpqcg3i45q25lz4lghzkcabnss4qand"; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 7fc11d49d7..6ff5c07721 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2006.0"; + version = "8.2102.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "15wfhw2nmpiyjpp82jxqgcjy7wgbc2fswk5g6rbdqbvghrj9wn6r"; + sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix b/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix index d0084e1f4d..587bc7639a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/sg3_utils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.45"; + name = "sg3_utils-1.46r862"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb"; + sha256 = "sha256-s2UmU+p3s7Hoe+GFri2q+/3XLBICc+h04cxM86yaAs8="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix b/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix index 88ead40541..45196422ff 100644 --- a/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.4"; + version = "4.2.6"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "02iy62b9wa5shxggflx99kv2q9xkilcsq94s0gbfq4m2aqjgzfwx"; + sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix index 6c92983585..9a3f37cc64 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.00"; + version = "3.4.04"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; + sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4="; }; buildInputs = [ bison ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix index 12fe3a9c9e..caa6335d45 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; + sha256 = "sha256-0Br+zuSUYrNP+ZL/FtNoaYoYBYho5kVfxu0tqKJSuBk="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix index 29007dd128..d3a136d6bf 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.10"; + version = "0.4.12"; src = fetchFromGitHub { - owner = "rust-lang-nursery"; + owner = "rust-lang"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-1Ddy/kb2Q7P+tzyEr3EC3qWm6MGSsDL3/vnPJLAm/J0="; + sha256 = "sha256-2lxotwL3Dc9jRA12iKO5zotO80pa+RfUZucyDRgFOsI="; }; - cargoSha256 = "sha256-x2BwnvEwTqz378aDE7OHWuEwNEsUnRudLq7sUJjHRpA="; + cargoSha256 = "sha256-TNd4pj4qSKgmmVtSCSKFCxNtv96xD7+24BPsLXPgiEI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { description = "Create books from MarkDown"; - homepage = "https://github.com/rust-lang-nursery/mdbook"; + homepage = "https://github.com/rust-lang/mdBook"; license = [ licenses.mpl20 ]; maintainers = [ maintainers.havvy ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix new file mode 100644 index 0000000000..9d98385933 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "pinyin-tool"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "briankung"; + repo = pname; + rev = version; + sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; + }; + + cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d"; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A simple command line tool for converting Chinese characters to space-separate pinyin words"; + homepage = "https://github.com/briankung/pinyin-tool"; + license = licenses.mit; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 640bf49fc1..6800e6bccd 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.5"; + version = "0.8.6"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "0gvrjxvizpxm5xvw8v2jygmx244wdl9n75qxz4chqbzkwshk4gwscz38p7sq9qlsbq8jmnv4l095a9dl9b836kym38hh1bvzmdiflar"; + sha512 = "3lvy23zg0hpixrf06g8hh15h2c9wwa0wa95vh2hp924kdi2akqcp2i313chycx1cmmg379w4v80ha2726ala69zxzk42y6djc8vm3xd"; }; nativeBuildInputs = [ which ] diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/reg/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/reg/default.nix new file mode 100644 index 0000000000..a1b246aff0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/virtualization/reg/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "reg"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "genuinetools"; + repo = "reg"; + rev = "v${version}"; + sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m"; + }; + + vendorSha256 = null; + doCheck = false; + + meta = with lib; { + description = "Docker registry v2 command line client and repo listing generator with security checks"; + homepage = "https://github.com/genuinetools/reg"; + license = licenses.mit; + maintainers = with maintainers; [ ereslibre ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index a91db03711..ae01948506 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -709,6 +709,7 @@ mapAliases ({ redkite = throw "redkite was archived by upstream"; # added 2021-04-12 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 rpiboot-unstable = rpiboot; # added 2021-07-30 + rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby"; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 204f3c8b6e..5af6ed97f1 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -10,19 +10,6 @@ res: pkgs: super: with pkgs; -let - self = - builtins.trace '' - It seems that you are using a patched Nixpkgs that references the self - variable in pkgs/top-level/all-packages.nix. This variable was incorrectly - named, so its usage needs attention. Please use pkgs for packages or super - for functions. - '' - res; # Do *NOT* use res in your fork. It will be removed. - - # TODO: turn self into an error - -in { # A stdenv capable of building 32-bit binaries. On x86_64-linux, @@ -3261,6 +3248,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + reg = callPackage ../tools/virtualization/reg { }; + river = callPackage ../applications/window-managers/river { }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; @@ -5147,7 +5136,9 @@ in gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../tools/networking/gftp { }; + gftp = callPackage ../applications/networking/gftp { + gtk = gtk2; + }; gfbgraph = callPackage ../development/libraries/gfbgraph { }; @@ -6842,6 +6833,8 @@ in libmesode = callPackage ../development/libraries/libmesode {}; + libmsym = callPackage ../development/libraries/science/chemistry/libmsym { }; + libnabo = callPackage ../development/libraries/libnabo { }; libngspice = callPackage ../development/libraries/libngspice { }; @@ -8077,6 +8070,10 @@ in pixiewps = callPackage ../tools/networking/pixiewps {}; + pinyin-tool = callPackage ../tools/text/pinyin-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; + pk2cmd = callPackage ../tools/misc/pk2cmd { }; plantuml = callPackage ../tools/misc/plantuml { }; @@ -8732,6 +8729,8 @@ in scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; + scorecard = callPackage ../tools/security/scorecard { }; + scream = callPackage ../applications/audio/scream { }; scimark = callPackage ../misc/scimark { }; @@ -11918,14 +11917,10 @@ in mint = callPackage ../development/compilers/mint { }; mitscheme = callPackage ../development/compilers/mit-scheme { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; - xlibsWrapper = null; + texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { - texLive = texlive.combine { inherit (texlive) scheme-small; }; - texinfo = texinfo5; enableX11 = true; }; @@ -11964,7 +11959,7 @@ in roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { }; + msbuild = callPackage ../development/tools/build-managers/msbuild { dotnet-sdk = dotnet-sdk_5; }; mosml = callPackage ../development/compilers/mosml { }; @@ -13544,6 +13539,8 @@ in inherit (llvmPackages_11) llvm libclang; }; + cwltool = callPackage ../applications/science/misc/cwltool { }; + dprint = callPackage ../development/tools/dprint { }; libcxx = llvmPackages.libcxx; @@ -14078,6 +14075,8 @@ in mkdocs = callPackage ../development/tools/documentation/mkdocs { }; + mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { }; + mockgen = callPackage ../development/tools/mockgen { }; modd = callPackage ../development/tools/modd { }; @@ -14476,6 +14475,10 @@ in c2ffi = callPackage ../development/tools/misc/c2ffi { }; + c3c = callPackage ../development/compilers/c3c { + llvmPackages = llvmPackages_11; + }; + swfmill = callPackage ../tools/video/swfmill { }; swftools = callPackage ../tools/video/swftools { @@ -16741,6 +16744,8 @@ in libffi = callPackage ../development/libraries/libffi { }; + libfreeaptx = callPackage ../development/libraries/libfreeaptx { }; + libfreefare = callPackage ../development/libraries/libfreefare { inherit (darwin) libobjc; }; @@ -19736,7 +19741,7 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -21554,12 +21559,17 @@ in inherit name src; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + postPatch = '' + patchShebangs scripts/ + ''; buildPhase = '' + ( set -x make \ ARCH=${stdenv.hostPlatform.linuxArch} \ HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ ${makeTarget} + ) ''; installPhase = '' cp .config $out @@ -23105,6 +23115,8 @@ in vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; + vistafonts-cht = callPackage ../data/fonts/vista-fonts-cht { }; + vollkorn = callPackage ../data/fonts/vollkorn { }; weather-icons = callPackage ../data/fonts/weather-icons { }; @@ -23375,6 +23387,8 @@ in backintime = backintime-qt; + ballerburg = callPackage ../games/ballerburg { } ; + balsa = callPackage ../applications/networking/mailreaders/balsa { }; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -24053,6 +24067,8 @@ in expenses = callPackage ../applications/misc/expenses { }; + fnott = callPackage ../applications/misc/fnott { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -25503,6 +25519,8 @@ in kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { @@ -26221,6 +26239,8 @@ in yambar = callPackage ../applications/misc/yambar { }; + yambar-wayland = callPackage ../applications/misc/yambar { waylandSupport = true; }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -26752,9 +26772,7 @@ in polylith = callPackage ../development/tools/misc/polylith { }; - polymake = callPackage ../applications/science/math/polymake { - openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + polymake = callPackage ../applications/science/math/polymake { }; pond = callPackage ../applications/networking/instant-messengers/pond { }; @@ -27094,8 +27112,6 @@ in rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; librtlsdr = callPackage ../development/libraries/librtlsdr { }; - rtv = callPackage ../applications/misc/rtv { }; - rubyripper = callPackage ../applications/audio/rubyripper {}; runc = callPackage ../applications/virtualization/runc {}; @@ -27889,7 +27905,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64: + # neovim doesn't build with luajit on aarch64-darwin : # ./luarocks init # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: # no field package.preload['luarocks.core.hardcoded'] @@ -27913,7 +27929,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/129099 # Possibly related: https://github.com/neovim/neovim/issues/7879 lua = - if stdenv.isAarch64 then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else luajit; }; @@ -28502,6 +28518,8 @@ in xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; + xplugd = callPackage ../tools/X11/xplugd { }; + xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; xkb-switch = callPackage ../tools/X11/xkb-switch { }; @@ -28686,9 +28704,6 @@ in zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; - # Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build - # with rust 1.53. This should be fixed in the next version. - rustPlatform = rustPackages_1_45.rustPlatform; }; zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; @@ -30078,6 +30093,12 @@ in eigen = eigen2; }; + avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { }; + + molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { }; + + avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; + chemtool = callPackage ../applications/science/chemistry/chemtool { }; cp2k = callPackage ../applications/science/chemistry/cp2k { }; @@ -32636,7 +32657,7 @@ in stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; + omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; }; wasmtime = callPackage ../development/interpreters/wasmtime {}; diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index b0e9e8c0a1..a0ff132480 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -80,6 +80,8 @@ let self = rec { steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { }; + steam-library = callPackage ../applications/video/kodi-packages/steam-library { }; + pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { }; pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { }; @@ -120,6 +122,10 @@ let self = rec { requests = callPackage ../applications/video/kodi-packages/requests { }; + requests-cache = callPackage ../applications/video/kodi-packages/requests-cache { }; + + routing = callPackage ../applications/video/kodi-packages/routing { }; + signals = callPackage ../applications/video/kodi-packages/signals { }; six = callPackage ../applications/video/kodi-packages/six { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 9fc50a6d2f..ee7db9d5d3 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -569,6 +569,8 @@ in { aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + assertpy = callPackage ../development/python-modules/assertpy { }; + asteval = callPackage ../development/python-modules/asteval { }; astor = callPackage ../development/python-modules/astor { }; @@ -993,6 +995,8 @@ in { bacpypes = callPackage ../development/python-modules/bacpypes { }; + bagit = callPackage ../development/python-modules/bagit { }; + banal = callPackage ../development/python-modules/banal { }; bandit = callPackage ../development/python-modules/bandit { }; @@ -3942,10 +3946,9 @@ in { kmapper = callPackage ../development/python-modules/kmapper { }; - kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { - inherit (pkgs.kmsxx) stdenv; + kmsxx = toPythonModule (pkgs.kmsxx.override { withPython = true; - }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); + }); knack = callPackage ../development/python-modules/knack { }; @@ -4232,6 +4235,8 @@ in { lmtpd = callPackage ../development/python-modules/lmtpd { }; + loca = callPackage ../development/python-modules/loca { }; + localimport = callPackage ../development/python-modules/localimport { }; localzone = callPackage ../development/python-modules/localzone { }; @@ -4410,7 +4415,7 @@ in { maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit buildPythonPackage isPy27 fetchPypi; + inherit buildPythonPackage pythonOlder fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -6902,6 +6907,8 @@ in { pytest-mock = callPackage ../development/python-modules/pytest-mock { }; + pytest-mockservers = callPackage ../development/python-modules/pytest-mockservers { }; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; @@ -6940,6 +6947,8 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { @@ -7857,6 +7866,8 @@ in { schema = callPackage ../development/python-modules/schema { }; + schema-salad = callPackage ../development/python-modules/schema-salad { }; + schiene = callPackage ../development/python-modules/schiene { }; scikit-bio = callPackage ../development/python-modules/scikit-bio { }; @@ -8000,6 +8011,8 @@ in { sh = callPackage ../development/python-modules/sh { }; + shellescape = callPackage ../development/python-modules/shellescape { }; + shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { @@ -8727,6 +8740,8 @@ in { timelib = callPackage ../development/python-modules/timelib { }; + time-machine = callPackage ../development/python-modules/time-machine { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; timezonefinder = callPackage ../development/python-modules/timezonefinder { }; @@ -8793,6 +8808,8 @@ in { # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; + torrequest = callPackage ../development/python-modules/torrequest { }; + total-connect-client = callPackage ../development/python-modules/total-connect-client { }; towncrier = callPackage ../development/python-modules/towncrier { @@ -8933,6 +8950,8 @@ in { types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-pytz = callPackage ../development/python-modules/types-pytz { }; + types-requests = callPackage ../development/python-modules/types-requests { }; typesentry = callPackage ../development/python-modules/typesentry { }; @@ -9429,6 +9448,8 @@ in { xmltodict = callPackage ../development/python-modules/xmltodict { }; + xml-marshaller = callPackage ../development/python-modules/xml-marshaller { }; + xmodem = callPackage ../development/python-modules/xmodem { }; xnd = callPackage ../development/python-modules/xnd { };