diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index 79d90c23a4..cfe8582e51 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -224,7 +224,7 @@ There are a few naming guidelines: - Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. -- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also [](#sec-versioning) +- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [](#sec-versioning) ## File naming and organisation {#sec-organisation} diff --git a/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md b/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md index d266a03226..47035551d4 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md @@ -32,9 +32,9 @@ Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes Here is a simple package example. -- It defines an (optional) attribute `minimalOCamlVersion` that will be used to - throw a descriptive evaluation error if building with an older OCaml is - attempted. +- It defines an (optional) attribute `minimalOCamlVersion` (see note below) + that will be used to throw a descriptive evaluation error if building with + an older OCaml is attempted. - It uses the `fetchFromGitHub` fetcher to get its source. @@ -117,3 +117,11 @@ buildDunePackage rec { }; } ``` + +Note about `minimalOCamlVersion`. A deprecated version of this argument was +spelled `minimumOCamlVersion`; setting the old attribute wrongly modifies the +derivation hash and is therefore inappropriate. As a technical dept, currently +packaged libraries may still use the old spelling: maintainers are invited to +fix this when updating packages. Massive renaming is strongly discouraged as it +would be challenging to review, difficult to test, and will cause unnecessary +rebuild. diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index ac518cee52..d3e1dd5b27 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -192,10 +192,6 @@ meta.hydraPlatforms = []; If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. -### `updateWalker` {#var-meta-updateWalker} - -If set to `true`, the package is tested to be updated correctly by the `update-walker.sh` script without additional settings. Such packages have `meta.version` set and their homepage (or the page specified by `meta.downloadPage`) contains a direct link to the package tarball. - ## Licenses {#sec-meta-license} The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression. diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index 39553cde0a..29dffa9fa4 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -48,10 +48,6 @@ system.nixos.versionSuffix = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; system.nixos.revision = final.mkIf (self ? rev) self.rev; - - # NOTE: This assumes that `nixpkgs.config` is _not_ used when - # nixpkgs.pkgs is set OR _module.args.pkgs is set. - nixpkgs.config.path = self.outPath; } ]; }); @@ -66,7 +62,7 @@ }).nixos.manual.x86_64-linux; }; - legacyPackages = forAllSystems (system: import ./. { inherit system; config.path = self.outPath; }); + legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { notDetected = import ./nixos/modules/installer/scan/not-detected.nix; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index e991280a0f..6ae60956ae 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -6068,6 +6068,16 @@ githubId = 2396926; name = "Justin Woo"; }; + jvanbruegge = { + email = "supermanitu@gmail.com"; + github = "jvanbruegge"; + githubId = 1529052; + name = "Jan van Brügge"; + keys = [{ + longkeyid = "rsa4096/0x366572BE7D6C78A2"; + fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; + }]; + }; jwatt = { email = "jwatt@broken.watch"; github = "jjwatt"; diff --git a/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 4c399586eb..a1431859ff 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 . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver --interactive +$ ./result/bin/nixos-test-driver [...] >>> ``` @@ -28,7 +28,7 @@ You can re-use the VM states coming from a previous run by setting the `--keep-vm-state` flag. ```ShellSession -$ ./result/bin/nixos-test-driver --interactive --keep-vm-state +$ ./result/bin/nixos-test-driver --keep-vm-state ``` The machine state is stored in the `$TMPDIR/vm-state-machinename` diff --git a/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 8348ab56de..0e47350a0d 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 . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver --interactive +$ ./result/bin/nixos-test-driver [...] >>> @@ -30,7 +30,7 @@ $ ./result/bin/nixos-test-driver --interactive the --keep-vm-state flag. -$ ./result/bin/nixos-test-driver --interactive --keep-vm-state +$ ./result/bin/nixos-test-driver --keep-vm-state The machine state is stored in the diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 436157515e..e99f786b33 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -442,13 +442,49 @@ - The interface that allows activation scripts to restart units - has been reworked. Restarting and reloading is now done by a - single file - /run/nixos/activation-restart-list that - honors restartIfChanged and - reloadIfChanged of the units. + switch-to-configuration (the script that is + run when running nixos-rebuild switch for + example) has been reworked + + + + The interface that allows activation scripts to restart + units has been streamlined. Restarting and reloading is + now done by a single file + /run/nixos/activation-restart-list that + honors restartIfChanged and + reloadIfChanged of the units. + + + + + The script now uses a proper ini-file parser to parse + systemd units. Some values are now only searched in one + section instead of in the entire unit. This is only + relevant for units that don’t use the NixOS systemd moule. + + + + + RefuseManualStop, + X-OnlyManualStart, + X-StopOnRemoval, + X-StopOnReconfiguration are only + searched in the [Unit] section + + + + + X-ReloadIfChanged, + X-RestartIfChanged, + X-StopIfChanged are only searched + in the [Service] section + + + + + @@ -531,6 +567,29 @@ was added. + + + The configuration portion of the nix-daemon + module has been reworked and exposed as + nix.settings: + + + + + Legacy options have been mapped to the corresponding + options under under + nix.settings + but may be deprecated in the future. + + + + + nix.buildMachines.publicHostKey + has been added. + + + + The @@ -541,6 +600,19 @@ using the PyPy interpreter were added. + + + If you are using Wayland you can choose to use the Ozone + Wayland support in Chrome and several Electron apps by setting + the environment variable NIXOS_OZONE_WL=1 + (for example via + environment.sessionVariables.NIXOS_OZONE_WL = "1"). + This is not enabled by default because Ozone Wayland is still + under heavy development and behavior is not always flawless. + Furthermore, not all Electron apps use the latest Electron + versions. + + The influxdb2 package was split into @@ -712,6 +784,15 @@ warning. + + + programs.tmux has a new option + plugins that accepts a list of packages + from the tmuxPlugins group. The specified + packages are added to the system and loaded by + tmux. + + diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index 6c7fc57f8d..ab2a5d83a0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -453,7 +453,7 @@ Allow ad-hoc remote builders for building the new system. This requires the user executing nixos-rebuild (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by - using the nix.trustedUsers NixOS option. Examples + using the nix.settings.trusted-users NixOS option. Examples values for that option are described in the Remote builds chapter in the Nix manual, (i.e. --builders "ssh://bigbrother x86_64-linux"). By specifying an empty string diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index 9d919711cb..a8b717c6f8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -60,7 +60,7 @@ In addition to numerous new and upgraded packages, this release has the followin ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} - `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`. - This *only* makes a difference if you are cross-compiling and will + This _only_ makes a difference if you are cross-compiling and will ensure that `pkgs.ghc` always runs on the host platform and compiles for the target platform (similar to `pkgs.gcc` for example). `haskellPackages.ghc` still behaves as before, running on the build @@ -141,7 +141,11 @@ In addition to numerous new and upgraded packages, this release has the followin `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and doesn't include serif fonts. -- The interface that allows activation scripts to restart units has been reworked. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. +- `switch-to-configuration` (the script that is run when running `nixos-rebuild switch` for example) has been reworked + * The interface that allows activation scripts to restart units has been streamlined. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. + * The script now uses a proper ini-file parser to parse systemd units. Some values are now only searched in one section instead of in the entire unit. This is only relevant for units that don't use the NixOS systemd moule. + * `RefuseManualStop`, `X-OnlyManualStart`, `X-StopOnRemoval`, `X-StopOnReconfiguration` are only searched in the `[Unit]` section + * `X-ReloadIfChanged`, `X-RestartIfChanged`, `X-StopIfChanged` are only searched in the `[Service]` section - The `services.bookstack.cacheDir` option has been removed, since the cache directory is now handled by systemd. @@ -177,14 +181,26 @@ In addition to numerous new and upgraded packages, this release has the followin to allow users to make changes to the `nixos-rebuild build-vm` configuration that do not apply to their normal system. - The `config.system.build.vm` attribute now always exists and defaults to the + The `config.system.build.vm` attribute now always exists and defaults to the value from `vmVariant`. Configurations that import the `virtualisation/qemu-vm.nix` module themselves will override this value, such that `vmVariant` is not used. Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added. +- The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings): + * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) but may be deprecated in the future. + * [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added. + - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added. +- If you are using Wayland you can choose to use the Ozone Wayland support + in Chrome and several Electron apps by setting the environment variable + `NIXOS_OZONE_WL=1` (for example via + `environment.sessionVariables.NIXOS_OZONE_WL = "1"`). + This is not enabled by default because Ozone Wayland is + still under heavy development and behavior is not always flawless. + Furthermore, not all Electron apps use the latest Electron versions. + - The `influxdb2` package was split into `influxdb2-server` and `influxdb2-cli`, matching the split that took place upstream. A combined `influxdb2` package is still provided in this release for @@ -236,11 +252,14 @@ In addition to numerous new and upgraded packages, this release has the followin Plugins are automatically repackaged using autoPatchelf. - The `zrepl` package has been updated from 0.4.0 to 0.5: - * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. - * A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. + + - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. + - A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. - Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`. Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`. + diff --git a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix index 01f954a4d3..832a33d642 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-unit-options.nix @@ -98,7 +98,7 @@ in rec { description = mkOption { default = ""; - type = types.str; + type = types.singleLineStr; description = "Description of this unit used in systemd messages and progress indicators."; }; diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py index 5477ab5cd0..61d91c9ed6 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py @@ -33,6 +33,22 @@ class EnvDefault(argparse.Action): setattr(namespace, self.dest, values) +def writeable_dir(arg: str) -> Path: + """Raises an ArgumentTypeError if the given argument isn't a writeable directory + Note: We want to fail as early as possible if a directory isn't writeable, + since an executed nixos-test could fail (very late) because of the test-driver + writing in a directory without proper permissions. + """ + path = Path(arg) + if not path.is_dir(): + raise argparse.ArgumentTypeError("{0} is not a directory".format(path)) + if not os.access(path, os.W_OK): + raise argparse.ArgumentTypeError( + "{0} is not a writeable directory".format(path) + ) + return path + + def main() -> None: arg_parser = argparse.ArgumentParser(prog="nixos-test-driver") arg_parser.add_argument( @@ -45,7 +61,7 @@ def main() -> None: "-I", "--interactive", help="drop into a python repl and run the tests interactively", - action="store_true", + action=argparse.BooleanOptionalAction, ) arg_parser.add_argument( "--start-scripts", @@ -63,6 +79,14 @@ def main() -> None: nargs="*", help="vlans to span by the driver", ) + arg_parser.add_argument( + "-o", + "--output_directory", + help="""The path to the directory where outputs copied from the VM will be placed. + By e.g. Machine.copy_from_vm or Machine.screenshot""", + default=Path.cwd(), + type=writeable_dir, + ) arg_parser.add_argument( "testscript", action=EnvDefault, @@ -77,7 +101,11 @@ def main() -> None: rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state") with Driver( - args.start_scripts, args.vlans, args.testscript.read_text(), args.keep_vm_state + args.start_scripts, + args.vlans, + args.testscript.read_text(), + args.output_directory.resolve(), + args.keep_vm_state, ) as driver: if args.interactive: ptpython.repl.embed(driver.test_symbols(), {}) @@ -94,7 +122,7 @@ def generate_driver_symbols() -> None: in user's test scripts. That list is then used by pyflakes to lint those scripts. """ - d = Driver([], [], "") + d = Driver([], [], "", Path()) test_symbols = d.test_symbols() with open("driver-symbols", "w") as fp: fp.write(",".join(test_symbols.keys())) diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py index 49a42fe5fb..880b1c5fde 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py @@ -10,6 +10,28 @@ from test_driver.vlan import VLan from test_driver.polling_condition import PollingCondition +def get_tmp_dir() -> Path: + """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD + Raises an exception in case the retrieved temporary directory is not writeable + See https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir + """ + tmp_dir = Path(tempfile.gettempdir()) + tmp_dir.mkdir(mode=0o700, exist_ok=True) + if not tmp_dir.is_dir(): + raise NotADirectoryError( + "The directory defined by TMPDIR, TEMP, TMP or CWD: {0} is not a directory".format( + tmp_dir + ) + ) + if not os.access(tmp_dir, os.W_OK): + raise PermissionError( + "The directory defined by TMPDIR, TEMP, TMP, or CWD: {0} is not writeable".format( + tmp_dir + ) + ) + return tmp_dir + + class Driver: """A handle to the driver that sets up the environment and runs the tests""" @@ -24,12 +46,13 @@ class Driver: start_scripts: List[str], vlans: List[int], tests: str, + out_dir: Path, keep_vm_state: bool = False, ): self.tests = tests + self.out_dir = out_dir - tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir())) - tmp_dir.mkdir(mode=0o700, exist_ok=True) + tmp_dir = get_tmp_dir() with rootlog.nested("start all VLans"): self.vlans = [VLan(nr, tmp_dir) for nr in vlans] @@ -47,6 +70,7 @@ class Driver: name=cmd.machine_name, tmp_dir=tmp_dir, callbacks=[self.check_polling_conditions], + out_dir=self.out_dir, ) for cmd in cmd(start_scripts) ] @@ -141,8 +165,8 @@ class Driver: "Using legacy create_machine(), please instantiate the" "Machine class directly, instead" ) - tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir())) - tmp_dir.mkdir(mode=0o700, exist_ok=True) + + tmp_dir = get_tmp_dir() if args.get("startCommand"): start_command: str = args.get("startCommand", "") @@ -154,6 +178,7 @@ class Driver: return Machine( tmp_dir=tmp_dir, + out_dir=self.out_dir, start_command=cmd, name=name, keep_vm_state=args.get("keep_vm_state", False), diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index e050cbd7d9..a41c419ebe 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -297,6 +297,7 @@ class Machine: the machine lifecycle with the help of a start script / command.""" name: str + out_dir: Path tmp_dir: Path shared_dir: Path state_dir: Path @@ -325,6 +326,7 @@ class Machine: def __init__( self, + out_dir: Path, tmp_dir: Path, start_command: StartCommand, name: str = "machine", @@ -332,6 +334,7 @@ class Machine: allow_reboot: bool = False, callbacks: Optional[List[Callable]] = None, ) -> None: + self.out_dir = out_dir self.tmp_dir = tmp_dir self.keep_vm_state = keep_vm_state self.allow_reboot = allow_reboot @@ -702,10 +705,9 @@ class Machine: self.connected = True def screenshot(self, filename: str) -> None: - out_dir = os.environ.get("out", os.getcwd()) word_pattern = re.compile(r"^\w+$") if word_pattern.match(filename): - filename = os.path.join(out_dir, "{}.png".format(filename)) + filename = os.path.join(self.out_dir, "{}.png".format(filename)) tmp = "{}.ppm".format(filename) with self.nested( @@ -756,7 +758,6 @@ class Machine: all the VMs (using a temporary directory). """ # Compute the source, target, and intermediate shared file names - out_dir = Path(os.environ.get("out", os.getcwd())) vm_src = Path(source) with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td: shared_temp = Path(shared_td) @@ -766,7 +767,7 @@ class Machine: # Copy the file to the shared directory inside VM self.succeed(make_command(["mkdir", "-p", vm_shared_temp])) self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate])) - abs_target = out_dir / target_dir / vm_src.name + abs_target = self.out_dir / target_dir / vm_src.name abs_target.parent.mkdir(exist_ok=True, parents=True) # Copy the file from the shared directory outside VM if intermediate.is_dir(): diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index a670404681..0d3c3a89e7 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -30,7 +30,7 @@ rec { # effectively mute the XMLLogger export LOGFILE=/dev/null - ${driver}/bin/nixos-test-driver + ${driver}/bin/nixos-test-driver -o $out ''; passthru = driver.passthru // { @@ -51,6 +51,7 @@ rec { , enableOCR ? false , skipLint ? false , passthru ? {} + , interactive ? false }: let # Reifies and correctly wraps the python test driver for @@ -139,7 +140,8 @@ rec { wrapProgram $out/bin/nixos-test-driver \ --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ - --set vlans '${toString vlans}' + --set vlans '${toString vlans}' \ + ${lib.optionalString (interactive) "--add-flags --interactive"} ''); # Make a full-blown test @@ -217,6 +219,7 @@ rec { testName = name; qemu_pkg = pkgs.qemu; nodes = nodes pkgs.qemu; + interactive = true; }; test = diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix index 855bd3bab7..d283742701 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix @@ -17,7 +17,7 @@ in description = "Azure NixOS Test User"; openssh.authorizedKeys.keys = [ (builtins.readFile ~/.ssh/id_ed25519.pub) ]; }; - nix.trustedUsers = [ username ]; + nix.settings.trusted-users = [ username ]; virtualisation.azureImage.diskSize = 2500; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix b/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix index 80ec3126ca..088f2af59e 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix @@ -1,4 +1,4 @@ -{ config, pkgs ,lib ,... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,13 +13,13 @@ with lib; options.xdg.portal = { enable = - mkEnableOption "xdg desktop integration"//{ + mkEnableOption "xdg desktop integration" // { default = false; }; extraPortals = mkOption { type = types.listOf types.package; - default = []; + default = [ ]; description = '' List of additional portals to add to path. Portals allow interaction with system, like choosing files or taking screenshots. At minimum, @@ -46,25 +46,36 @@ with lib; let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; - joinedPortals = pkgs.symlinkJoin { + joinedPortals = pkgs.buildEnv { name = "xdg-portals"; - paths = cfg.extraPortals; + paths = packages; + pathsToLink = [ "/share/xdg-desktop-portal/portals" "/share/applications" ]; }; - in mkIf cfg.enable { + in + mkIf cfg.enable { assertions = [ - { assertion = (cfg.gtkUsePortal -> cfg.extraPortals != []); - message = "Setting xdg.portal.gtkUsePortal to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde."; + { + assertion = cfg.extraPortals != [ ]; + message = "Setting xdg.portal.enable to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde."; } ]; - services.dbus.packages = packages; + services.dbus.packages = packages; systemd.packages = packages; - environment.sessionVariables = { - GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; - XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; + environment = { + # fixes screen sharing on plasmawayland on non-chromium apps by linking + # share/applications/*.desktop files + # see https://github.com/NixOS/nixpkgs/issues/145174 + systemPackages = [ joinedPortals ]; + pathsToLink = [ "/share/applications" ]; + + sessionVariables = { + GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; + XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; + }; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix b/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix index 2768e17590..27a7651382 100644 --- a/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix +++ b/third_party/nixpkgs/nixos/modules/installer/virtualbox-demo.nix @@ -25,7 +25,7 @@ with lib; installer.cloneConfigExtra = '' # Let demo build as a trusted user. - # nix.trustedUsers = [ "demo" ]; + # nix.settings.trusted-users = [ "demo" ]; # Mount a VirtualBox shared folder. # This is configurable in the VirtualBox menu at diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index 2afa43a3fe..b7746ddc21 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -61,85 +61,17 @@ let in scrubbedEval.options; baseOptionsJSON = let - filterIntoStore = + filter = builtins.filterSource (n: t: (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); - - # Figure out if Nix runs in pure evaluation mode. May return true in - # impure mode, but this is highly unlikely. - # We need to know because of https://github.com/NixOS/nix/issues/1888 - # and https://github.com/NixOS/nix/issues/5868 - isPureEval = builtins.getEnv "PATH" == "" && builtins.getEnv "_" == ""; - - # Return a nixpkgs subpath with minimal copying. - # - # The sources for the base options json derivation can come in one of - # two forms: - # - single source: a store path with all of nixpkgs, postfix with - # subpaths to access various directories. This has the benefit of - # not creating copies of these subtrees in the Nix store, but - # can cause unnecessary rebuilds if you update the Nixpkgs `pkgs` - # tree often. - # - split sources: multiple store paths with subdirectories of - # nixpkgs that exclude the bulk of the pkgs directory. - # This requires more copying and hashing during evaluation but - # requires fewer files to be copied. This method produces fewer - # unnecessary rebuilds of the base options json. - # - # Flake - # - # Flakes always put a copy of the full nixpkgs sources in the store, - # so we can use the "single source" method. This method is ideal - # for using nixpkgs as a dependency, as the base options json will be - # substitutable from cache.nixos.org. - # - # This requires that the `self.outPath` is wired into `pkgs` correctly, - # which is done for you if `pkgs` comes from the `lib.nixosSystem` or - # `legacyPackages` flake attributes. - # - # Other Nixpkgs invocation - # - # If you do not use the known-correct flake attributes, but rather - # invoke Nixpkgs yourself, set `config.path` to the correct path value, - # e.g. `import nixpkgs { config.path = nixpkgs; }`. - # - # Choosing between single or split source paths - # - # We make assumptions based on the type and contents of `pkgs.path`. - # By passing a different `config.path` to Nixpkgs, you can influence - # how your documentation cache is evaluated and rebuilt. - # - # Single source - # - If pkgs.path is a string containing a store path, the code has no - # choice but to create this store path, if it hasn't already been. - # We assume that the "single source" method is most efficient. - # - If pkgs.path is a path value containing that is a store path, - # we try to convert it to a string with context without copying. - # This occurs for example when nixpkgs was fetched and using its - # default `config.path`, which is `./.`. - # Nix currently does not allow this conversion when evaluating in - # pure mode. If the conversion is not possible, we use the - # "split source" method. - # - # Split source - # - If pkgs.path is a path value that is not a store path, we assume - # that it's unlikely for all of nixpkgs to end up in the store for - # other reasons and try to keep both the copying and rebuilds low. - pull = - if builtins.typeOf pkgs.path == "string" && isStorePath pkgs.path then - dir: "${pkgs.path}/${dir}" - else if !isPureEval && isStorePath pkgs.path then - dir: "${builtins.storePath pkgs.path}/${dir}" - else - dir: filterIntoStore "${toString pkgs.path}/${dir}"; in pkgs.runCommand "lazy-options.json" { - libPath = pull "lib"; - pkgsLibPath = pull "pkgs/pkgs-lib"; - nixosPath = pull "nixos"; + libPath = filter "${toString pkgs.path}/lib"; + pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; + nixosPath = filter "${toString pkgs.path}/nixos"; modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; } '' export NIX_STORE_DIR=$TMPDIR/store diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index 14dd1d816d..69967c8a76 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -59,8 +59,6 @@ let inherit (cfg) config overlays localSystem crossSystem; }; - # NOTE: flake.nix assumes that nixpkgs.config is only used with ../../.. - # as nixpkgs.config.path should be equivalent to ../../.. finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs; in diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 4b2cb803e2..c2b1e88668 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -852,7 +852,6 @@ ./services/networking/quassel.nix ./services/networking/quorum.nix ./services/networking/quicktun.nix - ./services/networking/racoon.nix ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix index 3f8f78f012..856ee480fc 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/hardened.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/hardened.nix @@ -17,7 +17,7 @@ with lib; boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened; - nix.allowedUsers = mkDefault [ "@users" ]; + nix.settings.allowed-users = mkDefault [ "@users" ]; environment.memoryAllocator.provider = mkDefault "scudo"; environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; diff --git a/third_party/nixpkgs/nixos/modules/programs/tmux.nix b/third_party/nixpkgs/nixos/modules/programs/tmux.nix index c39908751d..74b3fbd9ac 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tmux.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tmux.nix @@ -52,6 +52,12 @@ let set -s escape-time ${toString cfg.escapeTime} set -g history-limit ${toString cfg.historyLimit} + ${lib.optionalString (cfg.plugins != []) '' + # Run plugins + ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins} + + ''} + ${cfg.extraConfig} ''; @@ -165,6 +171,13 @@ in { downside it doesn't survive user logout. ''; }; + + plugins = mkOption { + default = []; + type = types.listOf types.package; + description = "List of plugins to install."; + example = lib.literalExpression "[ pkgs.tmuxPlugins.nord ]"; + }; }; }; @@ -174,7 +187,7 @@ in { environment = { etc."tmux.conf".text = tmuxConf; - systemPackages = [ pkgs.tmux ]; + systemPackages = [ pkgs.tmux ] ++ cfg.plugins; variables = { TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}''; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index b9a2f47f3f..81843dc0f9 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -80,6 +80,9 @@ with lib; libinput and synaptics. '') (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") + (mkRemovedOptionModule [ "services" "racoon" ] '' + The racoon module has been removed, because the software project was abandoned upstream. + '') # Do NOT add any option renames here, see top of the file ]; diff --git a/third_party/nixpkgs/nixos/modules/security/misc.nix b/third_party/nixpkgs/nixos/modules/security/misc.nix index e7abc1e0d5..c20e067b8c 100644 --- a/third_party/nixpkgs/nixos/modules/security/misc.nix +++ b/third_party/nixpkgs/nixos/modules/security/misc.nix @@ -123,8 +123,8 @@ with lib; boot.kernel.sysctl."user.max_user_namespaces" = 0; assertions = [ - { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces; - message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`."; + { assertion = config.nix.settings.sandbox -> config.security.allowUserNamespaces; + message = "`nix.settings.sandbox = true` conflicts with `!security.allowUserNamespaces`."; } ]; }) diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index d4b8541c6a..dc58c63452 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -147,7 +147,7 @@ in concurrent = mkOption { type = types.int; default = 1; - example = literalExpression "config.nix.maxJobs"; + example = literalExpression "config.nix.settings.max-jobs"; description = '' Limits how many jobs globally can be run concurrently. The most upper limit of jobs using all defined runners. diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 968bc8f1e5..ef1933e122 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -67,7 +67,7 @@ in # Trusted user allows simplified configuration and better performance # when operating in a cluster. - nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + nix.settings.trusted-users = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; services.hercules-ci-agent = { settings = { nixUserIsTrusted = true; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index ccb7cc2173..cc5de97d6d 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -258,8 +258,6 @@ in uid = config.ids.uids.hydra-www; }; - nix.trustedUsers = [ "hydra-queue-runner" ]; - services.hydra.extraConfig = '' using_frontend_proxy = 1 @@ -277,16 +275,21 @@ in environment.variables = hydraEnv; - nix.extraOptions = '' - keep-outputs = true - keep-derivations = true + nix.settings = mkMerge [ + { + keep-outputs = true; + keep-derivations = true; + trusted-users = [ "hydra-queue-runner" ]; + } - - '' + optionalString (versionOlder (getVersion config.nix.package.out) "2.4pre") '' - # The default (`true') slows Nix down a lot since the build farm - # has so many GC roots. - gc-check-reachability = false - ''; + (mkIf (versionOlder (getVersion config.nix.package.out) "2.4pre") + { + # The default (`true') slows Nix down a lot since the build farm + # has so many GC roots. + gc-check-reachability = false; + } + ) + ]; systemd.services.hydra-init = { wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix index b6f5e04511..6214f7f7eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix @@ -79,10 +79,7 @@ in { config = mkIf cfg.enable { systemd.services.mx-puppet-discord = { - description = '' - mx-puppet-discord is a discord puppeting bridge for matrix. - It handles bridging private and group DMs, as well as Guilds (servers). - ''; + description = "Matrix to Discord puppeting bridge"; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ cfg.serviceDependencies; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 869feb05eb..cd4408cef4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -6,20 +6,20 @@ let cfg = config.nix; - nix = cfg.package.out; + nixPackage = cfg.package.out; - nixVersion = getVersion nix; - - isNix23 = versionAtLeast nixVersion "2.3pre"; + isNixAtLeast = versionAtLeast (getVersion nixPackage); makeNixBuildUser = nr: { - name = "nixbld${toString nr}"; + name = "nixbld${toString nr}"; value = { description = "Nix build user ${toString nr}"; - /* For consistency with the setgid(2), setuid(2), and setgroups(2) - calls in `libstore/build.cc', don't add any supplementary group - here except "nixbld". */ + /* + For consistency with the setgid(2), setuid(2), and setgroups(2) + calls in `libstore/build.cc', don't add any supplementary group + here except "nixbld". + */ uid = builtins.add config.ids.uids.nixbld nr; isSystemUser = true; group = "nixbld"; @@ -30,43 +30,82 @@ let nixbldUsers = listToAttrs (map makeNixBuildUser (range 1 cfg.nrBuildUsers)); nixConf = - assert versionAtLeast nixVersion "2.2"; - pkgs.runCommand "nix.conf" { preferLocalBuild = true; extraOptions = cfg.extraOptions; } ( - '' - cat > $out </dev/null - '') - ); + ${mkKeyValuePairs cfg.settings} + ${cfg.extraOptions} + ''; + checkPhase = + if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then '' + echo "Ignoring validation for cross-compilation" + '' + else '' + echo "Validating generated nix.conf" + ln -s $out ./nix.conf + set -e + set +o pipefail + NIX_CONF_DIR=$PWD \ + ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \ + |& sed -e 's/^warning:/error:/' \ + | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}') + set -o pipefail + ''; + }; + + legacyConfMappings = { + useSandbox = "sandbox"; + buildCores = "cores"; + maxJobs = "max-jobs"; + sandboxPaths = "extra-sandbox-paths"; + binaryCaches = "substituters"; + trustedBinaryCaches = "trusted-substituters"; + binaryCachePublicKeys = "trusted-public-keys"; + autoOptimiseStore = "auto-optimise-store"; + requireSignedBinaryCaches = "require-sigs"; + trustedUsers = "trusted-users"; + allowedUsers = "allowed-users"; + systemFeatures = "system-feature"; + }; + + semanticConfType = with types; + let + confAtom = nullOr + (oneOf [ + bool + int + float + str + path + package + ]) // { + description = "Nix config atom (null, bool, int, float, str, path or package)"; + }; + in + attrsOf (either confAtom (listOf confAtom)); in @@ -76,7 +115,7 @@ in (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ]) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") - ]; + ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModule [ "nix" oldConf ] [ "nix" "settings" newConf ]) legacyConfMappings; ###### interface @@ -102,81 +141,6 @@ in ''; }; - maxJobs = mkOption { - type = types.either types.int (types.enum ["auto"]); - default = "auto"; - example = 64; - description = '' - This option defines the maximum number of jobs that Nix will try to - build in parallel. The default is auto, which means it will use all - available logical cores. It is recommend to set it to the total - number of logical cores in your system (e.g., 16 for two CPUs with 4 - cores each and hyper-threading). - ''; - }; - - autoOptimiseStore = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - If set to true, Nix automatically detects files in the store that have - identical contents, and replaces them with hard links to a single copy. - This saves disk space. If set to false (the default), you can still run - nix-store --optimise to get rid of duplicate files. - ''; - }; - - buildCores = mkOption { - type = types.int; - default = 0; - example = 64; - description = '' - This option defines the maximum number of concurrent tasks during - one build. It affects, e.g., -j option for make. - The special value 0 means that the builder should use all - available CPU cores in the system. Some builds may become - non-deterministic with this option; use with care! Packages will - only be affected if enableParallelBuilding is set for them. - ''; - }; - - useSandbox = mkOption { - type = types.either types.bool (types.enum ["relaxed"]); - default = true; - description = " - If set, Nix will perform builds in a sandboxed environment that it - will set up automatically for each build. This prevents impurities - in builds by disallowing access to dependencies outside of the Nix - store by using network and mount namespaces in a chroot environment. - This is enabled by default even though it has a possible performance - impact due to the initial setup time of a sandbox for each build. It - doesn't affect derivation hashes, so changing this option will not - trigger a rebuild of packages. - "; - }; - - sandboxPaths = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/dev" "/proc" ]; - description = - '' - Directories from the host filesystem to be included - in the sandbox. - ''; - }; - - extraOptions = mkOption { - type = types.lines; - default = ""; - example = '' - keep-outputs = true - keep-derivations = true - ''; - description = "Additional text appended to nix.conf."; - }; - distributedBuilds = mkOption { type = types.bool; default = false; @@ -187,7 +151,7 @@ in }; daemonCPUSchedPolicy = mkOption { - type = types.enum ["other" "batch" "idle"]; + type = types.enum [ "other" "batch" "idle" ]; default = "other"; example = "batch"; description = '' @@ -218,7 +182,7 @@ in }; daemonIOSchedClass = mkOption { - type = types.enum ["best-effort" "idle"]; + type = types.enum [ "best-effort" "idle" ]; default = "best-effort"; example = "idle"; description = '' @@ -250,11 +214,11 @@ in scheduling policy: With idle, priorities are not used in scheduling decisions. best-effort supports values in the range 0 (high) to 7 (low). - ''; + ''; }; buildMachines = mkOption { - type = types.listOf (types.submodule ({ + type = types.listOf (types.submodule { options = { hostName = mkOption { type = types.str; @@ -276,7 +240,7 @@ in }; systems = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "x86_64-linux" "aarch64-linux" ]; description = '' The system types the build machine can execute derivations on. @@ -293,7 +257,7 @@ in The username to log in as on the remote host. This user must be able to log in and run nix commands non-interactively. It must also be privileged to build derivations, so must be included in - . + . ''; }; sshKey = mkOption { @@ -331,7 +295,7 @@ in }; mandatoryFeatures = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "big-parallel" ]; description = '' A list of features mandatory for this builder. The builder will @@ -342,7 +306,7 @@ in }; supportedFeatures = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "kvm" "big-parallel" ]; description = '' A list of features supported by this builder. The builder will @@ -350,9 +314,18 @@ in list. ''; }; + publicHostKey = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The (base64-encoded) public host key of this builder. The field + is calculated via base64 -w0 /etc/ssh/ssh_host_type_key.pub. + If null, SSH will use its regular known-hosts file when connecting. + ''; + }; }; - })); - default = []; + }); + default = [ ]; description = '' This option lists the machines to be used if distributed builds are enabled (see ). @@ -366,7 +339,7 @@ in envVars = mkOption { type = types.attrs; internal = true; - default = {}; + default = { }; description = "Environment variables used by Nix."; }; @@ -391,92 +364,13 @@ in ''; }; - binaryCaches = mkOption { - type = types.listOf types.str; - description = '' - List of binary cache URLs used to obtain pre-built binaries - of Nix packages. - - By default https://cache.nixos.org/ is added, - to override it use lib.mkForce []. - ''; - }; - - trustedBinaryCaches = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "https://hydra.nixos.org/" ]; - description = '' - List of binary cache URLs that non-root users can use (in - addition to those specified using - ) by passing - --option binary-caches to Nix commands. - ''; - }; - - requireSignedBinaryCaches = mkOption { - type = types.bool; - default = true; - description = '' - If enabled (the default), Nix will only download binaries from binary caches if - they are cryptographically signed with any of the keys listed in - . If disabled, signatures are neither - required nor checked, so it's strongly recommended that you use only - trustworthy caches and https to prevent man-in-the-middle attacks. - ''; - }; - - binaryCachePublicKeys = mkOption { - type = types.listOf types.str; - example = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; - description = '' - List of public keys used to sign binary caches. If - is enabled, - then Nix will use a binary from a binary cache if and only - if it is signed by any of the keys - listed here. By default, only the key for - cache.nixos.org is included. - ''; - }; - - trustedUsers = mkOption { - type = types.listOf types.str; - default = [ "root" ]; - example = [ "root" "alice" "@wheel" ]; - description = '' - A list of names of users that have additional rights when - connecting to the Nix daemon, such as the ability to specify - additional binary caches, or to import unsigned NARs. You - can also specify groups by prefixing them with - @; for instance, - @wheel means all users in the wheel - group. - ''; - }; - - allowedUsers = mkOption { - type = types.listOf types.str; - default = [ "*" ]; - example = [ "@wheel" "@builders" "alice" "bob" ]; - description = '' - A list of names of users (separated by whitespace) that are - allowed to connect to the Nix daemon. As with - , you can specify groups by - prefixing them with @. Also, you can - allow all users by specifying *. The - default is *. Note that trusted users are - always allowed to connect. - ''; - }; - nixPath = mkOption { type = types.listOf types.str; - default = - [ - "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; + default = [ + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]; description = '' The default Nix expression search path, used by the Nix evaluator to look up paths enclosed in angle brackets @@ -484,45 +378,44 @@ in ''; }; - systemFeatures = mkOption { - type = types.listOf types.str; - example = [ "kvm" "big-parallel" "gccarch-skylake" ]; - description = '' - The supported features of a machine - ''; - }; - checkConfig = mkOption { type = types.bool; default = true; description = '' - If enabled (the default), checks that Nix can parse the generated nix.conf. + If enabled (the default), checks for data type mismatches and that Nix + can parse the generated nix.conf. ''; }; registry = mkOption { type = types.attrsOf (types.submodule ( let - inputAttrs = types.attrsOf (types.oneOf [types.str types.int types.bool types.package]); + referenceAttrs = with types; attrsOf (oneOf [ + str + int + bool + package + ]); in { config, name, ... }: - { options = { + { + options = { from = mkOption { - type = inputAttrs; + type = referenceAttrs; example = { type = "indirect"; id = "nixpkgs"; }; description = "The flake reference to be rewritten."; }; to = mkOption { - type = inputAttrs; + type = referenceAttrs; example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; - description = "The flake reference to which is to be rewritten."; + description = "The flake reference is rewritten to."; }; flake = mkOption { type = types.nullOr types.attrs; default = null; example = literalExpression "nixpkgs"; description = '' - The flake input to which is to be rewritten. + The flake input is rewritten to. ''; }; exact = mkOption { @@ -537,35 +430,232 @@ in }; config = { from = mkDefault { type = "indirect"; id = name; }; - to = mkIf (config.flake != null) - ({ type = "path"; - path = config.flake.outPath; - } // lib.filterAttrs - (n: v: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") - config.flake); + to = mkIf (config.flake != null) (mkDefault + { + type = "path"; + path = config.flake.outPath; + } // filterAttrs + (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake); }; } )); - default = {}; + default = { }; description = '' A system-wide flake registry. ''; }; - }; + extraOptions = mkOption { + type = types.lines; + default = ""; + example = '' + keep-outputs = true + keep-derivations = true + ''; + description = "Additional text appended to nix.conf."; + }; + settings = mkOption { + type = types.submodule { + freeformType = semanticConfType; + + options = { + max-jobs = mkOption { + type = types.either types.int (types.enum [ "auto" ]); + default = "auto"; + example = 64; + description = '' + This option defines the maximum number of jobs that Nix will try to + build in parallel. The default is auto, which means it will use all + available logical cores. It is recommend to set it to the total + number of logical cores in your system (e.g., 16 for two CPUs with 4 + cores each and hyper-threading). + ''; + }; + + auto-optimise-store = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, Nix automatically detects files in the store that have + identical contents, and replaces them with hard links to a single copy. + This saves disk space. If set to false (the default), you can still run + nix-store --optimise to get rid of duplicate files. + ''; + }; + + cores = mkOption { + type = types.int; + default = 0; + example = 64; + description = '' + This option defines the maximum number of concurrent tasks during + one build. It affects, e.g., -j option for make. + The special value 0 means that the builder should use all + available CPU cores in the system. Some builds may become + non-deterministic with this option; use with care! Packages will + only be affected if enableParallelBuilding is set for them. + ''; + }; + + sandbox = mkOption { + type = types.either types.bool (types.enum [ "relaxed" ]); + default = true; + description = '' + If set, Nix will perform builds in a sandboxed environment that it + will set up automatically for each build. This prevents impurities + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This is enabled by default even though it has a possible performance + impact due to the initial setup time of a sandbox for each build. It + doesn't affect derivation hashes, so changing this option will not + trigger a rebuild of packages. + ''; + }; + + extra-sandbox-paths = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "/dev" "/proc" ]; + description = '' + Directories from the host filesystem to be included + in the sandbox. + ''; + }; + + substituters = mkOption { + type = types.listOf types.str; + description = '' + List of binary cache URLs used to obtain pre-built binaries + of Nix packages. + + By default https://cache.nixos.org/ is added. + ''; + }; + + trusted-substituters = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "https://hydra.nixos.org/" ]; + description = '' + List of binary cache URLs that non-root users can use (in + addition to those specified using + ) by passing + --option binary-caches to Nix commands. + ''; + }; + + require-sigs = mkOption { + type = types.bool; + default = true; + description = '' + If enabled (the default), Nix will only download binaries from binary caches if + they are cryptographically signed with any of the keys listed in + . If disabled, signatures are neither + required nor checked, so it's strongly recommended that you use only + trustworthy caches and https to prevent man-in-the-middle attacks. + ''; + }; + + trusted-public-keys = mkOption { + type = types.listOf types.str; + example = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; + description = '' + List of public keys used to sign binary caches. If + is enabled, + then Nix will use a binary from a binary cache if and only + if it is signed by any of the keys + listed here. By default, only the key for + cache.nixos.org is included. + ''; + }; + + trusted-users = mkOption { + type = types.listOf types.str; + default = [ "root" ]; + example = [ "root" "alice" "@wheel" ]; + description = '' + A list of names of users that have additional rights when + connecting to the Nix daemon, such as the ability to specify + additional binary caches, or to import unsigned NARs. You + can also specify groups by prefixing them with + @; for instance, + @wheel means all users in the wheel + group. + ''; + }; + + system-features = mkOption { + type = types.listOf types.str; + example = [ "kvm" "big-parallel" "gccarch-skylake" ]; + description = '' + The set of features supported by the machine. Derivations + can express dependencies on system features through the + requiredSystemFeatures attribute. + + By default, pseudo-features nixos-test, benchmark, + and big-parallel used in Nixpkgs are set, kvm + is also included in it is avaliable. + ''; + }; + + allowed-users = mkOption { + type = types.listOf types.str; + default = [ "*" ]; + example = [ "@wheel" "@builders" "alice" "bob" ]; + description = '' + A list of names of users (separated by whitespace) that are + allowed to connect to the Nix daemon. As with + , you can specify groups by + prefixing them with @. Also, you can + allow all users by specifying *. The + default is *. Note that trusted users are + always allowed to connect. + ''; + }; + }; + }; + default = { }; + example = literalExpression '' + { + use-sandbox = true; + show-trace = true; + + system-features = [ "big-parallel" "kvm" "recursive-nix" ]; + sandbox-paths = { "/bin/sh" = "''${pkgs.busybox-sandbox-shell.out}/bin/busybox"; }; + } + ''; + description = '' + Configuration for Nix, see + or + + nix.conf + 5 + for avalaible options. + The value declared here will be translated directly to the key-value pairs Nix expects. + + + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings + to view the current value. By default it is empty. + + + Nix configurations defined under will be translated and applied to this + option. In addition, configuration specified in which will be appended + verbatim to the resulting config file. + ''; + }; + }; }; ###### implementation config = mkIf cfg.enable { - - nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; - nix.binaryCaches = [ "https://cache.nixos.org/" ]; - environment.systemPackages = - [ nix + [ + nixPackage pkgs.nix-info ] ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions; @@ -579,44 +669,49 @@ in # List of machines for distributed Nix builds in the format # expected by build-remote.pl. - environment.etc."nix/machines" = - { enable = cfg.buildMachines != []; - text = - concatMapStrings (machine: - "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " - + (if machine.system != null then machine.system else concatStringsSep "," machine.systems) - + " ${if machine.sshKey != null then machine.sshKey else "-"} ${toString machine.maxJobs} " - + toString (machine.speedFactor) - + " " - + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) - + " " - + concatStringsSep "," machine.mandatoryFeatures + environment.etc."nix/machines" = mkIf (cfg.buildMachines != [ ]) { + text = + concatMapStrings + (machine: + (concatStringsSep " " ([ + "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") + (if machine.sshKey != null then machine.sshKey else "-") + (toString machine.maxJobs) + (toString machine.speedFactor) + (concatStringsSep "," machine.supportedFeatures) + (concatStringsSep "," machine.mandatoryFeatures) + ] + ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) + "\n" - ) cfg.buildMachines; - }; + ) + cfg.buildMachines; + }; + assertions = - let badMachine = m: m.system == null && m.systems == []; - in [ + let badMachine = m: m.system == null && m.systems == [ ]; + in + [ { - assertion = !(builtins.any badMachine cfg.buildMachines); + assertion = !(any badMachine cfg.buildMachines); message = '' At least one system type (via system or systems) must be set for every build machine. Invalid machine specifications: '' + " " + - (builtins.concatStringsSep "\n " - (builtins.map (m: m.hostName) - (builtins.filter (badMachine) cfg.buildMachines))); + (concatStringsSep "\n " + (map (m: m.hostName) + (filter (badMachine) cfg.buildMachines))); } ]; - - systemd.packages = [ nix ]; + systemd.packages = [ nixPackage ]; systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = - { path = [ nix pkgs.util-linux config.programs.ssh.package ] + { + path = [ nixPackage pkgs.util-linux config.programs.ssh.package ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars @@ -626,7 +721,8 @@ in unitConfig.RequiresMountsFor = "/nix/store"; serviceConfig = - { CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; + { + CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; IOSchedulingClass = cfg.daemonIOSchedClass; IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 4096; @@ -636,9 +732,7 @@ in }; # Set up the environment variables for running Nix. - environment.sessionVariables = cfg.envVars // - { NIX_PATH = cfg.nixPath; - }; + environment.sessionVariables = cfg.envVars // { NIX_PATH = cfg.nixPath; }; environment.extraInit = '' @@ -647,7 +741,7 @@ in fi ''; - nix.nrBuildUsers = mkDefault (lib.max 32 (if cfg.maxJobs == "auto" then 0 else cfg.maxJobs)); + nix.nrBuildUsers = mkDefault (max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)); users.users = nixbldUsers; @@ -663,14 +757,26 @@ in fi ''; - nix.systemFeatures = mkDefault ( - [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( - # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} - ) - ); + # Legacy configuration conversion. + nix.settings = mkMerge [ + { + trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + substituters = [ "https://cache.nixos.org/" ]; + + system-features = mkDefault ( + [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ + optionals (pkgs.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} + ) + ); + } + + (mkIf (!cfg.distributedBuilds) { builders = null; }) + + (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) + ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix index d5c64fdb26..355fad5db4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix @@ -20,7 +20,7 @@ in { write = mkOption { type = types.bool; default = false; - description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the nix.trustedUsers option in most use cases, such as allowing remote building of derivations."; + description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the option in most use cases, such as allowing remote building of derivations."; }; keys = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index b6416b93e6..9e49601ce1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -25,7 +25,8 @@ in { [ "/dev/sda", "/dev/nvme0n1" ]; ''; description = '' - Paths to disks that will be monitored. + Paths to the disks that will be monitored. Will autodiscover + all disks if none given. ''; }; maxInterval = mkOption { @@ -41,13 +42,23 @@ in { serviceOpts = { serviceConfig = { AmbientCapabilities = [ + "CAP_RAW_SYSIO" "CAP_SYS_ADMIN" ]; CapabilityBoundingSet = [ + "CAP_RAW_SYSIO" "CAP_SYS_ADMIN" ]; DevicePolicy = "closed"; - DeviceAllow = lib.mkForce cfg.devices; + DeviceAllow = lib.mkOverride 100 ( + if cfg.devices != [] then + cfg.devices + else [ + "block-blkext rw" + "block-sd rw" + "char-nvme rw" + ] + ); ExecStart = '' ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter -config ${configFile} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix index 16011573f8..28b8be7a9a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -9,7 +9,7 @@ let # On Nix level we don't attempt to precisely validate the address specifications. # The optional IPv6 scope spec comes *after* port, perhaps surprisingly. mkListen = kind: addr: let - al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr; + al_v4 = builtins.match "([0-9.]+):([0-9]+)($)" addr; al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr; al_portOnly = builtins.match "([0-9]+)" addr; al = findFirst (a: a != null) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/racoon.nix b/third_party/nixpkgs/nixos/modules/services/networking/racoon.nix deleted file mode 100644 index 328f4cb149..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/racoon.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.racoon; -in { - options.services.racoon = { - enable = mkEnableOption "racoon"; - - config = mkOption { - description = "Contents of racoon configuration file."; - default = ""; - type = types.str; - }; - - configPath = mkOption { - description = "Location of racoon config if config is not provided."; - default = "/etc/racoon/racoon.conf"; - type = types.path; - }; - }; - - config = mkIf cfg.enable { - systemd.services.racoon = { - description = "Racoon Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${ - if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config - else cfg.configPath - }"; - ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; - PIDFile = "/run/racoon.pid"; - Type = "forking"; - Restart = "always"; - }; - preStart = '' - rm /run/racoon.pid || true - mkdir -p /var/racoon - ''; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 739ba1ea12..141ab98e29 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -599,6 +599,8 @@ in { timerConfig.Unit = "nextcloud-cron.service"; }; + systemd.tmpfiles.rules = ["d ${cfg.home} 0750 nextcloud nextcloud"]; + systemd.services = { # When upgrading the Nextcloud package, Nextcloud can report errors such as # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly" @@ -720,8 +722,6 @@ in { before = [ "phpfpm-nextcloud.service" ]; path = [ occ ]; script = '' - chmod og+x ${cfg.home} - ${optionalString (c.dbpassFile != null) '' if [ ! -r "${c.dbpassFile}" ]; then echo "dbpassFile ${c.dbpassFile} is not readable by nextcloud:nextcloud! Aborting..." @@ -814,7 +814,6 @@ in { users.users.nextcloud = { home = "${cfg.home}"; group = "nextcloud"; - createHome = true; isSystemUser = true; }; users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 9bacdaa9be..b7aa2eba81 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -394,7 +394,8 @@ in # Extra UDEV rules used by Solid services.udev.packages = [ - pkgs.libmtp + # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out". + pkgs.libmtp.out pkgs.media-player-info ]; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 93fff889d6..1fe346114e 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -2,6 +2,7 @@ use strict; use warnings; +use Config::IniFiles; use File::Path qw(make_path); use File::Basename; use File::Slurp; @@ -113,26 +114,77 @@ sub parseFstab { return ($fss, $swaps); } -sub parseUnit { - my ($filename) = @_; - my $info = {}; - parseKeyValues($info, read_file($filename)) if -f $filename; - parseKeyValues($info, read_file("${filename}.d/overrides.conf")) if -f "${filename}.d/overrides.conf"; - return $info; -} +# This subroutine takes a single ini file that specified systemd configuration +# like unit configuration and parses it into a hash where the keys are the sections +# of the unit file and the values are hashes themselves. These hashes have the unit file +# keys as their keys (left side of =) and an array of all values that were set as their +# values. If a value is empty (for example `ExecStart=`), then all current definitions are +# removed. +# +# Instead of returning the hash, this subroutine takes a hashref to return the data in. This +# allows calling the subroutine multiple times with the same hash to parse override files. +sub parseSystemdIni { + my ($unitContents, $path) = @_; + # Tie the ini file to a hash for easier access + my %fileContents; + tie %fileContents, "Config::IniFiles", (-file => $path, -allowempty => 1, -allowcontinue => 1); -sub parseKeyValues { - my $info = shift; - foreach my $line (@_) { - # FIXME: not quite correct. - $line =~ /^([^=]+)=(.*)$/ or next; - $info->{$1} = $2; + # Copy over all sections + foreach my $sectionName (keys %fileContents) { + # Copy over all keys + foreach my $iniKey (keys %{$fileContents{$sectionName}}) { + # Ensure the value is an array so it's easier to work with + my $iniValue = $fileContents{$sectionName}{$iniKey}; + my @iniValues; + if (ref($iniValue) eq "ARRAY") { + @iniValues = @{$iniValue}; + } else { + @iniValues = $iniValue; + } + # Go over all values + for my $iniValue (@iniValues) { + # If a value is empty, it's an override that tells us to clean the value + if ($iniValue eq "") { + delete $unitContents->{$sectionName}->{$iniKey}; + next; + } + push(@{$unitContents->{$sectionName}->{$iniKey}}, $iniValue); + } + } } + return; } -sub boolIsTrue { - my ($s) = @_; - return $s eq "yes" || $s eq "true"; +# This subroutine takes the path to a systemd configuration file (like a unit configuration), +# parses it, and returns a hash that contains the contents. The contents of this hash are +# explained in the `parseSystemdIni` subroutine. Neither the sections nor the keys inside +# the sections are consistently sorted. +# +# If a directory with the same basename ending in .d exists next to the unit file, it will be +# assumed to contain override files which will be parsed as well and handled properly. +sub parseUnit { + my ($unitPath) = @_; + + # Parse the main unit and all overrides + my %unitData; + parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}"); + return %unitData; +} + +# Checks whether a specified boolean in a systemd unit is true +# or false, with a default that is applied when the value is not set. +sub parseSystemdBool { + my ($unitConfig, $sectionName, $boolName, $default) = @_; + + my @values = @{$unitConfig->{$sectionName}{$boolName} // []}; + # Return default if value is not set + if (scalar @values lt 1 || not defined $values[-1]) { + return $default; + } + # If value is defined multiple times, use the last definition + my $last = $values[-1]; + # These are valid values as of systemd.syntax(7) + return $last eq "1" || $last eq "yes" || $last eq "true" || $last eq "on"; } sub recordUnit { @@ -167,17 +219,17 @@ sub handleModifiedUnit { # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 } else { - my $unitInfo = parseUnit($newUnitFile); - if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { + my %unitInfo = parseUnit($newUnitFile); + if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0)) { $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { + elsif (!parseSystemdBool(\%unitInfo, "Service", "X-RestartIfChanged", 1) || parseSystemdBool(\%unitInfo, "Unit", "RefuseManualStop", 0) || parseSystemdBool(\%unitInfo, "Unit", "X-OnlyManualStart", 0)) { $unitsToSkip->{$unit} = 1; } else { # It doesn't make sense to stop and start non-services because # they can't have ExecStop= - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes") || $unit !~ /\.service$/) { + if (!parseSystemdBool(\%unitInfo, "Service", "X-StopIfChanged", 1) || $unit !~ /\.service$/) { # This unit should be restarted instead of # stopped and started. $unitsToRestart->{$unit} = 1; @@ -188,7 +240,7 @@ sub handleModifiedUnit { # socket(s) instead of the service. my $socketActivated = 0; if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); + my @sockets = split(/ /, join(" ", @{$unitInfo{Service}{Sockets} // []})); if (scalar @sockets == 0) { @sockets = ("$baseName.socket"); } @@ -254,12 +306,12 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - my $unitInfo = parseUnit($prevUnitFile); - $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes"); + my %unitInfo = parseUnit($prevUnitFile); + $unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1); } elsif ($unit =~ /\.target$/) { - my $unitInfo = parseUnit($newUnitFile); + my %unitInfo = parseUnit($newUnitFile); # Cause all active target units to be restarted below. # This should start most changed units we stop here as @@ -268,7 +320,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # active after the system has resumed, which probably # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { - unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { + unless (parseSystemdBool(\%unitInfo, "Unit", "RefuseManualStart", 0) || parseSystemdBool(\%unitInfo, "Unit", "X-OnlyManualStart", 0)) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); # Don't spam the user with target units that always get started. @@ -287,7 +339,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # Stopping a target generally has no effect on other units # (unless there is a PartOf dependency), so this is just a # bookkeeping thing to get systemd to do the right thing. - if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) { + if (parseSystemdBool(\%unitInfo, "Unit", "X-StopOnReconfiguration", 0)) { $unitsToStop{$unit} = 1; } } @@ -546,33 +598,36 @@ my $activeNew = getActiveUnits; while (my ($unit, $state) = each %{$activeNew}) { if ($state->{state} eq "failed") { push @failed, $unit; + next; } - elsif ($state->{state} eq "auto-restart") { - # A unit in auto-restart state is a failure *if* it previously failed to start - my $lines = `@systemd@/bin/systemctl show '$unit'`; - my $info = {}; - parseKeyValues($info, split("\n", $lines)); - if ($info->{ExecMainStatus} ne '0') { + if ($state->{substate} eq "auto-restart") { + # A unit in auto-restart substate is a failure *if* it previously failed to start + my $main_status = `@systemd@/bin/systemctl show --value --property=ExecMainStatus '$unit'`; + chomp($main_status); + + if ($main_status ne "0") { push @failed, $unit; + next; } } + # Ignore scopes since they are not managed by this script but rather # created and managed by third-party services via the systemd dbus API. - elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) { + # This only lists units that are not failed (including ones that are in auto-restart but have not failed previously) + if ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/msx) { push @new, $unit; } } -print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" - if scalar @new > 0; +if (scalar @new > 0) { + print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" +} if (scalar @failed > 0) { - print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n"; - foreach my $unit (@failed) { - print STDERR "\n"; - system("COLUMNS=1000 @systemd@/bin/systemctl status --no-pager '$unit' >&2"); - } + my @failed_sorted = sort @failed; + print STDERR "warning: the following units failed: ", join(", ", @failed_sorted), "\n\n"; + system "@systemd@/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"; $res = 4; } diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 18ac717f5d..9e6ca75b9d 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -117,7 +117,7 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = pkgs.perl.withPackages (p: with p; [ FileSlurp NetDBus XMLParser XMLTwig ]); + perl = pkgs.perl.withPackages (p: with p; [ FileSlurp NetDBus XMLParser XMLTwig ConfigIniFiles ]); }; # Handle assertions and warnings @@ -156,7 +156,7 @@ in specialisation = mkOption { default = {}; - example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.buildCores = 0; nix.maxJobs = 1; }; }"; + example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }"; description = '' Additional configurations to build. If inheritParentConfig is true, the system diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index 5bc603530f..33748358e4 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -300,18 +300,15 @@ in { interpreterSandboxPath = dirOf (dirOf interpreterReg); } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}")); }) cfg.emulatedSystems); - # TODO: add a nix.extraPlatforms option to NixOS! - nix.extraOptions = lib.mkIf (cfg.emulatedSystems != []) '' - extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} - ''; - nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) ( - let + nix.settings = lib.mkIf (cfg.emulatedSystems != []) { + extra-platforms = cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux"; + extra-sandbox-paths = let ruleFor = system: cfg.registrations.${system}; hasWrappedRule = lib.any (system: (ruleFor system).wrapInterpreterInShell) cfg.emulatedSystems; in [ "/run/binfmt" ] ++ lib.optional hasWrappedRule "${pkgs.bash}" - ++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems) - ); + ++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems); + }; environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix index 325f6f5b43..436a375fb5 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix @@ -36,17 +36,6 @@ in { Open vSwitch package to use. ''; }; - - ipsec = mkOption { - type = types.bool; - default = false; - description = '' - Whether to start racoon service for openvswitch. - Supported only if openvswitch version is less than 2.6.0. - Use virtualisation.vswitch.package = pkgs.openvswitch-lts - for a version that supports ipsec over GRE. - ''; - }; }; config = mkIf cfg.enable (let @@ -65,7 +54,7 @@ in { installPhase = "mkdir -p $out"; }; - in (mkMerge [{ + in { environment.systemPackages = [ cfg.package ]; boot.kernelModules = [ "tun" "openvswitch" ]; @@ -142,48 +131,14 @@ in { }; }; - } - (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) { - environment.systemPackages = [ pkgs.ipsecTools ]; + }); - services.racoon.enable = true; - services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; - - networking.firewall.extraCommands = '' - iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1 - iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1 - ''; - - systemd.services.ovs-monitor-ipsec = { - description = "Open_vSwitch Ipsec Daemon"; - wantedBy = [ "multi-user.target" ]; - requires = [ "ovsdb.service" ]; - before = [ "vswitchd.service" "racoon.service" ]; - environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; - serviceConfig = { - ExecStart = '' - ${cfg.package}/bin/ovs-monitor-ipsec \ - --root-prefix ${runDir}/ipsec \ - --pidfile /run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor --detach \ - unix:/run/openvswitch/db.sock - ''; - PIDFile = "/run/openvswitch/ovs-monitor-ipsec.pid"; - # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. - Type = "forking"; - }; - - preStart = '' - rm -r ${runDir}/ipsec/etc/racoon/certs || true - mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/} - ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey - ln -fs ${pkgs.writeScript "racoon-restart" '' - #!${pkgs.runtimeShell} - /run/current-system/sw/bin/systemctl $1 racoon - ''} ${runDir}/ipsec/etc/init.d/racoon - ''; - }; - })])); + imports = [ + (mkRemovedOptionModule [ "virtualisation" "vswitch" "ipsec" ] '' + OpenVSwitch IPSec functionality has been removed, because it depended on racoon, + which was removed from nixpkgs, because it was abanoded upstream. + '') + ]; meta.maintainers = with maintainers; [ netixx ]; diff --git a/third_party/nixpkgs/nixos/tests/containers-imperative.nix b/third_party/nixpkgs/nixos/tests/containers-imperative.nix index a126a5480c..14001657be 100644 --- a/third_party/nixpkgs/nixos/tests/containers-imperative.nix +++ b/third_party/nixpkgs/nixos/tests/containers-imperative.nix @@ -10,8 +10,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # XXX: Sandbox setup fails while trying to hardlink files from the host's # store file system into the prepared chroot directory. - nix.useSandbox = false; - nix.binaryCaches = []; # don't try to access cache.nixos.org + nix.settings.sandbox = false; + nix.settings.substituters = []; # don't try to access cache.nixos.org virtualisation.writableStore = true; # Make sure we always have all the required dependencies for creating a diff --git a/third_party/nixpkgs/nixos/tests/geth.nix b/third_party/nixpkgs/nixos/tests/geth.nix index 10cbd6d903..af8230553b 100644 --- a/third_party/nixpkgs/nixos/tests/geth.nix +++ b/third_party/nixpkgs/nixos/tests/geth.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_open_port(18545) machine.succeed( - 'geth attach --exec "eth.chainId()" http://localhost:8545 | grep \'"0x0"\' ' + 'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' ' ) machine.succeed( diff --git a/third_party/nixpkgs/nixos/tests/hardened.nix b/third_party/nixpkgs/nixos/tests/hardened.nix index da7e0972e1..dc455f971f 100644 --- a/third_party/nixpkgs/nixos/tests/hardened.nix +++ b/third_party/nixpkgs/nixos/tests/hardened.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; environment.memoryAllocator.provider = "graphene-hardened"; - nix.useSandbox = false; + nix.settings.sandbox = false; virtualisation.emptyDiskImages = [ 4096 ]; boot.initrd.postDeviceCommands = '' ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb diff --git a/third_party/nixpkgs/nixos/tests/hibernate.nix b/third_party/nixpkgs/nixos/tests/hibernate.nix index 4f05b99a5a..3880f1649b 100644 --- a/third_party/nixpkgs/nixos/tests/hibernate.nix +++ b/third_party/nixpkgs/nixos/tests/hibernate.nix @@ -45,11 +45,11 @@ in makeTest { ../modules/profiles/base.nix ]; - nix.binaryCaches = mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ diff --git a/third_party/nixpkgs/nixos/tests/hydra/common.nix b/third_party/nixpkgs/nixos/tests/hydra/common.nix index 1a3a4d8fb3..fdf2b2c6f6 100644 --- a/third_party/nixpkgs/nixos/tests/hydra/common.nix +++ b/third_party/nixpkgs/nixos/tests/hydra/common.nix @@ -42,7 +42,7 @@ hostName = "localhost"; systems = [ system ]; }]; - binaryCaches = []; + settings.substituters = []; }; }; } diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/flatpak.nix b/third_party/nixpkgs/nixos/tests/installed-tests/flatpak.nix index 8aeeaca90f..c7fe9cf458 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/flatpak.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/flatpak.nix @@ -6,6 +6,7 @@ makeInstalledTest { testConfig = { xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ gnupg ostree python3 ]; virtualisation.memorySize = 2047; diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 7c7eb004e5..761020571f 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -334,11 +334,11 @@ let (pkgs.grub2_efi.override { inherit zfsSupport; }) ]); - nix.binaryCaches = mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix index a26fea503b..92ae9990c9 100644 --- a/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix +++ b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix @@ -111,11 +111,11 @@ import ./make-test-python.nix ( environment.etc."initiator-root-disk-closure".source = nodes.initiatorRootDisk.config.system.build.toplevel; - nix.binaryCaches = lib.mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; }; initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/iscsi-root.nix b/third_party/nixpkgs/nixos/tests/iscsi-root.nix index bda51d2c2e..eb0719edc3 100644 --- a/third_party/nixpkgs/nixos/tests/iscsi-root.nix +++ b/third_party/nixpkgs/nixos/tests/iscsi-root.nix @@ -95,11 +95,11 @@ import ./make-test-python.nix ( system.extraDependencies = [ nodes.initiatorRootDisk.config.system.build.toplevel ]; - nix.binaryCaches = lib.mkForce []; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; }; initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/nixops/default.nix b/third_party/nixpkgs/nixos/tests/nixops/default.nix index ec3d028aab..b25fc95f4b 100644 --- a/third_party/nixpkgs/nixos/tests/nixops/default.nix +++ b/third_party/nixpkgs/nixos/tests/nixops/default.nix @@ -23,7 +23,7 @@ let deployer = { config, lib, nodes, pkgs, ... }: { imports = [ ../../modules/installer/cd-dvd/channel.nix ]; environment.systemPackages = [ nixopsPkg ]; - nix.binaryCaches = lib.mkForce [ ]; + nix.settings.substituters = lib.mkForce [ ]; users.users.person.isNormalUser = true; virtualisation.writableStore = true; virtualisation.additionalPaths = [ diff --git a/third_party/nixpkgs/nixos/tests/nixops/legacy/base-configuration.nix b/third_party/nixpkgs/nixos/tests/nixops/legacy/base-configuration.nix index dba960f595..7f1c07a5c4 100644 --- a/third_party/nixpkgs/nixos/tests/nixops/legacy/base-configuration.nix +++ b/third_party/nixpkgs/nixos/tests/nixops/legacy/base-configuration.nix @@ -16,7 +16,7 @@ in (modulesPath + "/testing/test-instrumentation.nix") ]; virtualisation.writableStore = true; - nix.binaryCaches = lib.mkForce [ ]; + nix.settings.substituters = lib.mkForce [ ]; virtualisation.graphics = false; documentation.enable = false; services.qemuGuest.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/os-prober.nix b/third_party/nixpkgs/nixos/tests/os-prober.nix index c1e29b0f68..90375450fe 100644 --- a/third_party/nixpkgs/nixos/tests/os-prober.nix +++ b/third_party/nixpkgs/nixos/tests/os-prober.nix @@ -43,11 +43,11 @@ let # vda is a filesystem without partition table forceInstall = true; }; - nix.binaryCaches = lib.mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; # save some memory documentation.enable = false; }; diff --git a/third_party/nixpkgs/nixos/tests/switch-test.nix b/third_party/nixpkgs/nixos/tests/switch-test.nix index 1c32bf6beb..8e425f0f87 100644 --- a/third_party/nixpkgs/nixos/tests/switch-test.nix +++ b/third_party/nixpkgs/nixos/tests/switch-test.nix @@ -45,6 +45,31 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.restartIfChanged = false; }; + simpleServiceFailing.configuration = { + imports = [ simpleServiceModified.configuration ]; + systemd.services.test.serviceConfig.ExecStart = lib.mkForce "${pkgs.coreutils}/bin/false"; + }; + + autorestartService.configuration = { + # A service that immediately goes into restarting (but without failing) + systemd.services.autorestart = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = "20y"; # Should be long enough + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + autorestartServiceFailing.configuration = { + imports = [ autorestartService.configuration ]; + systemd.services.autorestart.serviceConfig = { + ExecStart = lib.mkForce "${pkgs.coreutils}/bin/false"; + }; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -189,12 +214,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { exec env -i "$@" | tee /dev/stderr ''; in /* python */ '' - def switch_to_specialisation(system, name, action="test"): + def switch_to_specialisation(system, name, action="test", fail=False): if name == "": stc = f"{system}/bin/switch-to-configuration" else: stc = f"{system}/specialisation/{name}/bin/switch-to-configuration" - out = machine.succeed(f"{stc} {action} 2>&1") + out = machine.fail(f"{stc} {action} 2>&1") if fail \ + else machine.succeed(f"{stc} {action} 2>&1") assert_lacks(out, "switch-to-configuration line") # Perl warnings return out @@ -305,7 +331,56 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + with subtest("failing units"): + # Let the simple service fail + switch_to_specialisation("${machine}", "simpleServiceModified") + out = switch_to_specialisation("${machine}", "simpleServiceFailing", fail=True) + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: test.service\n") + assert_lacks(out, "the following new units were started:") + assert_contains(out, "warning: the following units failed: test.service\n") + assert_contains(out, "Main PID:") # output of systemctl + assert_lacks(out, "as well:") + + # A unit that gets into autorestart without failing is not treated as failed + out = switch_to_specialisation("${machine}", "autorestartService") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: autorestart.service\n") + assert_lacks(out, "as well:") + machine.systemctl('stop autorestart.service') # cancel the 20y timer + + # Switching to the same system should do nothing (especially not treat the unit as failed) + out = switch_to_specialisation("${machine}", "autorestartService") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: autorestart.service\n") + assert_lacks(out, "as well:") + machine.systemctl('stop autorestart.service') # cancel the 20y timer + + # If systemd thinks the unit has failed and is in autorestart, we should show it as failed + out = switch_to_specialisation("${machine}", "autorestartServiceFailing", fail=True) + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_contains(out, "warning: the following units failed: autorestart.service\n") + assert_contains(out, "Main PID:") # output of systemctl + assert_lacks(out, "as well:") + with subtest("restart and reload by activation script"): + switch_to_specialisation("${machine}", "simpleServiceNorestart") out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") assert_contains(out, "stopping the following units: test.service\n") assert_lacks(out, "NOT restarting the following changed units:") diff --git a/third_party/nixpkgs/nixos/tests/teeworlds.nix b/third_party/nixpkgs/nixos/tests/teeworlds.nix index 17e9eeb869..ac2c996955 100644 --- a/third_party/nixpkgs/nixos/tests/teeworlds.nix +++ b/third_party/nixpkgs/nixos/tests/teeworlds.nix @@ -36,12 +36,12 @@ in { client1.wait_for_x() client2.wait_for_x() - client1.execute("teeworlds 'player_name Alice;connect server'&") + client1.execute("teeworlds 'player_name Alice;connect server' >&2 &") server.wait_until_succeeds( 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Alice"' ) - client2.execute("teeworlds 'player_name Bob;connect server'&") + client2.execute("teeworlds 'player_name Bob;connect server' >&2 &") server.wait_until_succeeds( 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Bob"' ) diff --git a/third_party/nixpkgs/nixos/tests/vscodium.nix b/third_party/nixpkgs/nixos/tests/vscodium.nix index 66baea73ec..688ddfe07e 100644 --- a/third_party/nixpkgs/nixos/tests/vscodium.nix +++ b/third_party/nixpkgs/nixos/tests/vscodium.nix @@ -3,11 +3,10 @@ let wayland = { pkgs, ... }: { imports = [ ./common/wayland-cage.nix ]; - services.cage.program = '' - ${pkgs.vscodium}/bin/codium \ - --enable-features=UseOzonePlatform \ - --ozone-platform=wayland - ''; + services.cage.program = "${pkgs.vscodium}/bin/codium"; + + environment.variables.NIXOS_OZONE_WL = "1"; + environment.variables.DISPLAY = "do not use"; fonts.fonts = with pkgs; [ dejavu_fonts ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix index 3338fe40bf..d03b7836f2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cyanrip/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "cyanrip"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cyanreg"; repo = pname; rev = "v${version}"; - sha256 = "0lgb92sfpf4w3nj5vlj6j7931mj2q3cmcx1app9snf853jk9ahmw"; + sha256 = "1aip52bwkq8cb1d8ifyv2m6m5dz7jk6qmbhyb97yyf4nhxv445ky"; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/cyanreg/cyanrip"; description = "Bule-ish CD ripper"; - license = licenses.lgpl3Plus; + license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.zane ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix index e91cc9cc02..3fe3b0d06d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "spot"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY="; + hash = "sha256-uZzylK9imEazwC/ogsDO8ZBvByE5/SNSV+mIlp7Z9Ww="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg="; + hash = "sha256-v5xdlsI6OlEpCYOTFePTyI8BkIrAwT6FR2JwiRTGgOA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index f38bd678d9..ddc4264160 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.72.439.gc253025e"; + version = "1.1.77.643.g3c4c6fc6"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "56"; + rev = "57"; deps = [ alsa-lib @@ -80,7 +80,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "b2bd3d49a18dfebaa4660f9c39d11d57fb80a4ef15ec7b7973e3cc07be74f74aebd2d8c66360d79fe778244c533ed02f9dfca4085f99aae0e5faae7c003ba4ef"; + sha512 = "d9f8fe692db479bcce1f47c87b65c5ac6d62e16b76a0f9b2d693d82d2b9ed2c7cf370cb091ce8ecd291c47d1efdbaa897c9bffb210edd901dc3d5425995229f7"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index f2c262ece9..72c7537451 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -108,6 +108,7 @@ let gappsWrapperArgs+=( # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ) ''; diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 09c1fddbda..5ca31cc040 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -1,24 +1,29 @@ { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid +, cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas +, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid +, zstd, pdal, wrapGAppsHook }: stdenv.mkDerivation rec { name = "grass"; - version = "7.6.1"; + version = "7.8.6"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; - rev = "${name}_${replaceStrings ["."] ["_"] version}"; - sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; + rev = version; + sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas - libLAS proj-datumgrid ] - ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]); + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite + readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas + libLAS proj-datumgrid zstd wrapGAppsHook ] + ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ] + ++ lib.optional stdenv.isDarwin wxmac + ++ (with python3Packages; [ python python-dateutil numpy ] + ++ lib.optional stdenv.isDarwin wxPython_4_0 + ++ lib.optional stdenv.isLinux wxPython_4_1); # On Darwin the installer tries to symlink the help files into a system # directory @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-proj-share=${proj}/share/proj" "--with-proj-includes=${proj.dev}/include" - "--with-proj-lib=${proj}/lib" + "--with-proj-libs=${proj}/lib" "--without-opengl" "--with-readline" "--with-wxwidgets" @@ -46,6 +51,15 @@ stdenv.mkDerivation rec { "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" + "--with-zstd" + "--with-fftw" + "--with-pthread" + ] ++ lib.optionals stdenv.isLinux [ + "--with-pdal" + ] ++ lib.optionals stdenv.isDarwin [ + "--without-cairo" + "--without-freetype" + "--without-x" ]; # Otherwise a very confusing "Can't load GDAL library" error @@ -62,6 +76,7 @@ stdenv.mkDerivation rec { scripts/g.extension.all/g.extension.all.py \ scripts/r.drain/r.drain.py \ scripts/r.pack/r.pack.py \ + scripts/r.import/r.import.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ scripts/v.clip/v.clip.py \ @@ -79,18 +94,17 @@ stdenv.mkDerivation rec { temporal/t.rast.algebra/t.rast.algebra.py \ temporal/t.rast3d.algebra/t.rast3d.algebra.py \ temporal/t.vect.algebra/t.vect.algebra.py \ + temporal/t.downgrade/t.downgrade.py \ temporal/t.select/t.select.py for d in gui lib scripts temporal tools; do patchShebangs $d done ''; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - postInstall = '' - wrapProgram $out/bin/grass76 \ + wrapProgram $out/bin/grass78 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ + --set GRASS_PYTHON ${python3Packages.python.interpreter} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass*/lib $out/lib ln -s $out/grass*/include $out/include diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix index f272fd04dd..b3220f8d70 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -1,17 +1,21 @@ { lib, makeWrapper, symlinkJoin -, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 }: with lib; -symlinkJoin rec { +let + qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; +in symlinkJoin rec { + inherit (qgis-unwrapped) version; name = "qgis-${version}"; paths = [ qgis-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-unwrapped.python3Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. - pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.python3Packages); + pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); postBuild = '' # unpackPhase @@ -23,5 +27,7 @@ symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; + passthru.unwrapped = qgis-unwrapped; + meta = qgis-unwrapped.meta; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix new file mode 100644 index 0000000000..5db9a26ae7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix @@ -0,0 +1,32 @@ +{ lib, makeWrapper, symlinkJoin +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 +}: +with lib; +let + qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; +in symlinkJoin rec { + + inherit (qgis-ltr-unwrapped) version; + name = "qgis-${version}"; + + paths = [ qgis-ltr-unwrapped ]; + + nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; + + # extend to add to the python environment of QGIS without rebuilding QGIS application. + pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); + + postBuild = '' + + buildPythonPath "$pythonInputs" + + wrapProgram $out/bin/qgis \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + ''; + + passthru.unwrapped = qgis-ltr-unwrapped; + + inherit (qgis-ltr-unwrapped) meta; +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix new file mode 100644 index 0000000000..3de304f586 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -0,0 +1,148 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, ninja +, flex +, bison +, proj +, geos +, xlibsWrapper +, sqlite +, gsl +, qwt +, fcgi +, python3 +, libspatialindex +, libspatialite +, postgresql +, txt2tags +, openssl +, libzip +, hdf5 +, netcdf +, exiv2 +, protobuf +, qtbase +, qtsensors +, qca-qt5 +, qtkeychain +, qt3d +, qscintilla +, qtserialport +, qtxmlpatterns +, withGrass ? true +, grass +, withWebKit ? true +, qtwebkit +, makeWrapper +}: + +let + + py = python3.override { + packageOverrides = self: super: { + pyqt5 = super.pyqt5.override { + withLocation = true; + }; + }; + }; + + pythonBuildInputs = with py.pkgs; [ + qscintilla-qt5 + gdal + jinja2 + numpy + psycopg2 + chardet + python-dateutil + pyyaml + pytz + requests + urllib3 + pygments + pyqt5 + sip_4 + owslib + six + ]; +in mkDerivation rec { + version = "3.16.16"; + pname = "qgis-ltr-unwrapped"; + + src = fetchFromGitHub { + owner = "qgis"; + repo = "QGIS"; + rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "85RlV1Ik1BeN9B7UE51ktTWMiGkMga2E/fnhyiVwjIs="; + }; + + passthru = { + inherit pythonBuildInputs; + inherit py; + }; + + buildInputs = [ + openssl + proj + geos + xlibsWrapper + sqlite + gsl + qwt + exiv2 + protobuf + fcgi + libspatialindex + libspatialite + postgresql + txt2tags + libzip + hdf5 + netcdf + qtbase + qtsensors + qca-qt5 + qtkeychain + qscintilla + qtserialport + qtxmlpatterns + qt3d + ] ++ lib.optional withGrass grass + ++ lib.optional withWebKit qtwebkit + ++ pythonBuildInputs; + + nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + + # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 + # + # TODO: Correct PyQt5 to provide the expected directory and fix + # build to use PYQT5_SIP_DIR consistently. + postPatch = '' + substituteInPlace cmake/FindPyQt5.py \ + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' + ''; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DWITH_3D=True" + "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + + postFixup = lib.optionalString withGrass '' + # grass has to be availble on the command line even though we baked in + # the path at build time using GRASS_PREFIX + wrapProgram $out/bin/qgis \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + ''; + + meta = with lib; { + description = "A Free and Open Source Geographic Information System"; + homepage = "https://www.qgis.org"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ lsix sikmir erictapen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 14bafb6c51..816368bbab 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -12,7 +12,7 @@ , gsl , qwt , fcgi -, python3Packages +, python3 , libspatialindex , libspatialite , postgresql @@ -27,6 +27,7 @@ , qtsensors , qca-qt5 , qtkeychain +, qt3d , qscintilla , qtserialport , qtxmlpatterns @@ -34,10 +35,22 @@ , grass , withWebKit ? true , qtwebkit +, pdal +, zstd +, makeWrapper }: let - pythonBuildInputs = with python3Packages; [ + + py = python3.override { + packageOverrides = self: super: { + pyqt5 = super.pyqt5.override { + withLocation = true; + }; + }; + }; + + pythonBuildInputs = with py.pkgs; [ qscintilla-qt5 gdal jinja2 @@ -56,19 +69,19 @@ let six ]; in mkDerivation rec { - version = "3.16.14"; + version = "3.22.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-3FUGSBdlhJhhpTPtYuzKOznsC7PJV3kRL9Il2Yryi1Q="; + sha256 = "TLXhXHU0dp0MnKHFw/+1rQnJbebnwje21Oasy0qWctk="; }; passthru = { inherit pythonBuildInputs; - inherit python3Packages; + inherit py; }; buildInputs = [ @@ -96,11 +109,14 @@ in mkDerivation rec { qscintilla qtserialport qtxmlpatterns + qt3d + pdal + zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 # @@ -108,15 +124,24 @@ in mkDerivation rec { # build to use PYQT5_SIP_DIR consistently. postPatch = '' substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"' + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DWITH_3D=True" + "-DWITH_PDAL=TRUE" + "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + + postFixup = lib.optionalString withGrass '' + # grass has to be availble on the command line even though we baked in + # the path at build time using GRASS_PREFIX + wrapProgram $out/bin/qgis \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + ''; meta = { description = "A Free and Open Source Geographic Information System"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 3b215ea24f..7649068247 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3"; }; + patches = [ + # fix a type confusion bug introduced in 7.1.0-20 with commit 075565e93c71bcaaabf0ce70b7d1060bccdf0020 + (fetchpatch { + url = "https://github.com/ImageMagick/ImageMagick/commit/62845d5672eca4446b952dd0ab2e3e0dab0309d4.patch"; + sha256 = "1kni5i8b5hl69niypidm90mhir8cafi6r9i857fxdlv045h3dg4p"; + }) + ]; + outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.upstream b/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.upstream deleted file mode 100644 index e6c7ef2408..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://spiegl.de/qiv/download/ -version_link '[.]tgz$' -do_overwrite() { do_overwrite_just_version; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix index b82c3ff962..ffa76a6c07 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.19"; + version = "1.22"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-laP47xOND6PMA6dwTcCupcTIW+9zCaxO6rHzvDSL9JU="; + sha256 = "sha256-WLDQaN6wHnadvp0JyUzlcZVNiSbFudmmBSNYRMaE6U4="; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; + badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix index 4a41493a52..29a3bdc97b 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix @@ -19,5 +19,12 @@ mkDerivation { kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba solid gperf ]; + + # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras + postInstall = '' + substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \ + --replace Exec=$out Exec=${kio} + ''; + CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix index 174d6e22cc..d8db5441df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/auto-multiple-choice \ ''${makeWrapperArgs[@]} \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ArchiveZip DBDSQLite Cairo @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { GlibObjectIntrospection Gtk3 LocaleGettext + OpenOfficeOODoc PerlMagick TextCSV XMLParser diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 15faa7a32d..237c912678 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.44"; + version = "0.99.45"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-13wZb+PxeCrQ3MpewMnqBHO8QnoCRFhKU4awTdYtFd4="; + sha256 = "sha256-DGhzqv7huFVgCdXy3DuIBT+7s2q6FB7+gFPd4zEXi2M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/fme/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fme/default.nix deleted file mode 100644 index 03a9f875a7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/fme/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoconf -, automake -, bc -, fluxbox -, gettext -, glibmm -, gtkmm2 -, libglademm -, libsigcxx -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "fme"; - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "rdehouss"; - repo = "fme"; - rev = "v${version}"; - sha256 = "sha256-P67OmExBdWM6NZhDyYceVJOZiy8RC+njk/QvgQcWZeQ="; - }; - - nativeBuildInputs = [ - autoconf - automake - gettext - pkg-config - ]; - buildInputs = [ - bc - fluxbox - glibmm - gtkmm2 - libglademm - libsigcxx - ]; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - homepage = "https://github.com/rdehouss/fme/"; - description = "Editor for Fluxbox menus"; - longDescription = '' - Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox - written in C++ with the libraries Gtkmm, Glibmm, libglademm and gettext - for internationalization. Its user-friendly interface will help you to - edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. - ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 26c7698816..8f5eaf47b5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.20.1"; + version = "1.20.3"; src = fetchPypi { inherit pname version; - sha256 = "a1c06625381485f82aa14a038a622d40ab9cc2c8d150dd65c66df96dbf427f62"; + sha256 = "6d1d97bd08a2a0dcfb0578e759fb83c4902b395405b3e3238673f684973b0556"; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.upstream b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.upstream deleted file mode 100644 index 852233633c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.upstream +++ /dev/null @@ -1,7 +0,0 @@ -url https://mupdf.com/downloads/archive/ -do_overwrite(){ - ensure_hash - ensure_version - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix index 86ba7dbe13..3d7720d259 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rivercarro/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "rivercarro"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromSourcehut { owner = "~novakane"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "0h1wvl6rlrpr67zl51x71hy7nwkfd5kfv5p2mql6w5fybxxyqnpm"; + sha256 = "07md837ki0yln464w8vgwyl3yjrvkz1p8alxlmwqfn4w45nqhw77"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tomboy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tomboy/default.nix deleted file mode 100644 index 5aaec7a1e6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/tomboy/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, itstool, intltool, pkg-config -, libxml2, gnome2, atk, gtk2, glib -, mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 -, makeWrapper, lib}: - -let - version = "1.15.9"; -in - -stdenv.mkDerivation { - pname = "tomboy"; - inherit version; - - src = fetchurl { - url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; - sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ itstool intltool - libxml2 gnome2.GConf atk gtk2 - mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 - makeWrapper ]; - - postInstall = '' - makeWrapper "${mono}/bin/mono" "$out/bin/tomboy" \ - --add-flags "$out/lib/tomboy/Tomboy.exe" \ - --prefix MONO_GAC_PREFIX : ${dbus-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${dbus-sharp-glib-2_0} \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix MONO_GAC_PREFIX : ${mono-addins} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]} - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tomboy"; - description = "A simple note-taking application with synchronization"; - platforms = platforms.linux; - license = lib.licenses.lgpl2; - maintainers = with maintainers; [ stesie ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix index 2765cd5ad7..e3f2e80c47 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; - updateWalker = true; changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index c4521c89ca..f296da05c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -183,7 +183,8 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5734dfe9f0..935739b522 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0.2"; + version = "96.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ach/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ach/firefox-96.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b7120e412b7c111f8d136a93aea6f426770cf58319e7b410a4eddc4698e052aa"; + sha256 = "aee9a5f570fec2c8c0566f70673a6db1f60a92bb2c165ceb30f434b0dcf1a65b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/af/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/af/firefox-96.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b3068543e15fdf9c0f9cc6bf7407baded25ad4154f1c2034d9a00d91b5a68c11"; + sha256 = "f929516c277cfb2d45100e677ed9dd200f8b3a09166455f39c2474bad7cc4d74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/an/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/an/firefox-96.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6a74fe71edde4d2c47010dd0fdc7d33471ca31cb29b5a145bcdb30018a5e364c"; + sha256 = "daee2330478c036da51128c1f32d372b73b5400c8c0f261d50bfd821456042c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ar/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ar/firefox-96.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "be9c0fc67c7f3997e8c9b25dae08b9310c435caf60fc4eba6eef1ac0b2717aa9"; + sha256 = "51549041ec1cbf2e0caea181f4468f46d15dd1a7b6a620e359f6de533118f8af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ast/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ast/firefox-96.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "9a0e4231595413451039d598ac1dcfefa76784741f59b99a904c65b401786a6d"; + sha256 = "6cbce2293f1982e3e1cc993104a46f3093bec3f420af9ea561eb2601776b9cf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/az/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/az/firefox-96.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "41f3fc81dfdf6b151763a15686f7ee3aab6814b35835502180dc2e2f229feda6"; + sha256 = "45ba4e47ef4a32d4a8daa7b873a3658de2ebe88532f33af2fead1619939c8294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/be/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/be/firefox-96.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e6b32fa0e50d3c5694e6bad54e86f78d78fcc9c3e2ae83545e6dc1f42044ce30"; + sha256 = "58666c9b75862076b00144de96bbcdd8b0b3a5bf5bd0895065fb38d3c12a30ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bg/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bg/firefox-96.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b89cca59abc9566b07ac04796d3955df76dd31a3e99f2b28a8fd91a3197b2fb8"; + sha256 = "4ff97af116eb450edbb2a4c2d9864da3c0b07c5f6913f198b905779f2be48f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bn/firefox-96.0.3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e837daeb90214878ab4bb230955fcb67cbdfe4738ee6b93e41972d6789cb0713"; + sha256 = "bda665d796fe62524f1d1c96afc4c8da569e9b264895a26aaeb20bab7c2f3030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/br/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/br/firefox-96.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "acc80a336e85db0a4648f4cb6a389645647ac3a01920bd301953b6f80faee7fd"; + sha256 = "2305e226c5e492505dfc82fe34f17c8725eeab2ea10b61b089c92ad7b85a5186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/bs/firefox-96.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8be349dbb749401c23fa5679764372d536486ccc85950fed6d1818eeeb9df9c3"; + sha256 = "6aeb690c82790a72906ff80d55ae5de2dc7aa5a430c45a0ef2861336a6e73b15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ca-valencia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca-valencia/firefox-96.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "246d56a18b93e956299b0d9e4c3bcd37e33b08981cbf949f23999746da81ba2b"; + sha256 = "86e2a4720b991d6ffd7c9ce996162db9ef9ccd80da96fd5ad184ef006ae8fb1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ca/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ca/firefox-96.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7e4076f7f4ce566f1900850c04ca314cbd3e2ac0490d1e93e6fc2d405936f66c"; + sha256 = "0e9675d739eec02c98812e4d707c37d352de7605e9567d9d4adccd0e6ab40e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cak/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cak/firefox-96.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e0f3494fbd1c4ec6ba9993b9ef6fe6d5d8659034533afdeed8a539bad20451b6"; + sha256 = "35d5d2c5eef32819499b4078c7f31f23c848b44c40788ff42ba66d10b3771fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cs/firefox-96.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8bd32a17696fc93fddb14efa1ae60d98aa267f84482ec110c697cba380fc254f"; + sha256 = "67f42b8ce23ef78aab9fd5e61abada98d7fba5dd76d8c57ceefb43a1783d29a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cy/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/cy/firefox-96.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "761c62b1cd57d7c2e35195232fd094181c18f0ea10c5f4ae3ecc35f40d4061ca"; + sha256 = "c6bb154bb341b88994d060f18430670184bd3646c662da6351df11e2ce9a6abb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/da/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/da/firefox-96.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b08494880033516192c61fce66a64cc7dbebcaec595a089a24f2f7cd55f89396"; + sha256 = "3c268391a116f9b8ada73a98020c44f67bb9f275fbb7462a188e6d2d8acede7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/de/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/de/firefox-96.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "71459eef80ae2003549422041ab7741668497de3ccf36680037cdf3eb7cddc6b"; + sha256 = "dc5ce8991db83708bfbe686db8a3244e28e61077a754b6dc41f29946b8afb489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/dsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/dsb/firefox-96.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7c9e4aaf9874846eb403260ca20f05b3d02e9b0b125e106fb8bc77c8abcaaebd"; + sha256 = "9afd277a20cc47de854ec48c9aa484118e274ce24532e53076eafeb78d4f8e0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/el/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/el/firefox-96.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d7180afa9621488ba28bd7ada933451e11e080f74d6925d7b9d6edb7dbba3dfc"; + sha256 = "58130d71888ee7f3c40a1656ee0e7ab9f3538573f1dde104a93e850863ea1be9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-CA/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-CA/firefox-96.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26d179040167f5ae244a7c7f040ea8114ca8094b0394bb25e092e93496ca545b"; + sha256 = "2548098aa8527abd10b0f23203a1a4fafb231c6bf853d67c938006d6c230856a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-GB/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-GB/firefox-96.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6c53b1227cf43e1a8cf2cc0a4255efe28a852b395f8c9504f1c63ebd9ee1baae"; + sha256 = "c8f8e171e28b629fc9cfc4557409987e7a72aa9507a51fe2bf0f8347530cc962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-US/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/en-US/firefox-96.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ae8aad9fddd1e3b28da71a0811eda5dff49593371d5e3f6b8852835bdf43bced"; + sha256 = "2b642cfd2db0c2cb0f67453307a5a7d8c90e372a03274644212b51f60d503965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/eo/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eo/firefox-96.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e8e4a44511a5b0855b430063a2f6413603eda572e6f6567835fe7dbdfa4428ff"; + sha256 = "803ea1560568fb1c2af0bc0ff47a01ec7d854866b209bce7ceff8f7351a1cffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-AR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-AR/firefox-96.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3e18ce4633e66f51a2e89028cdb60cb68f01dea799590bf38ff663957ef7900a"; + sha256 = "4ab03c3623f26785b09308ca3d334536b169aec7690050db2141e40a83bd7b0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-CL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-CL/firefox-96.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8456b5c6a474221679a26803cebb1be001e97c195a3bd322f8c8996c1e8f2258"; + sha256 = "578e4ae8697ddf6754c88e94c7676b1f1fb4d0cd65dadd833966f1b69a277f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-ES/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-ES/firefox-96.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28cc54e6d1f540a139ad1cd5961799326c526ffd13bc611c2f276cf3853e8d5d"; + sha256 = "91ed54c34aac2fa5f3345403f4123f154679759bdbc4d6453de093216db630d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-MX/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/es-MX/firefox-96.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0796ca6961f66801162f44022704c921671066ce044514489bdf3a784c517b33"; + sha256 = "8cad63aedba46ae735a6d69e510c912f746ed5f1d0af8a8bc7f396a53ca9bd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/et/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/et/firefox-96.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fc8f8b3ed9dff593a3b6968b86364c516a910601c1d6576b160ccf9ca51d0adf"; + sha256 = "c12317af0fc4a4ae13a0ddb376192ba62ef3a2bc3205a0a87531ea4147707c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/eu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/eu/firefox-96.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1950fa86d15392b76b51a76ece16b9fae1fab449c7883cc6232e30bff75aa46f"; + sha256 = "a244b1fbd2ef6197c739834177e6bf9c8f1241f9257baa77eeebac149da0919e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fa/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fa/firefox-96.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8a7bc2e996ae85f7478792eef2ab9e0c2e67f845e8f89cebb8923a24f84c5dea"; + sha256 = "7eac238a916f009c83f8a95cb5f6d13e08461630094d85a78cfae041df7b9179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ff/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ff/firefox-96.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "158ead011e5e65f84f7f2801760331d157008cfc2916bb50ee3dfe65c5c78bc2"; + sha256 = "afd6d4635f3840287ac5497ec33555fa6399d0555e8a9a8cd8c58384d6aba6c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fi/firefox-96.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1472f32f694fd2e41b08c6be8cfdb35078a019c29ff03c39b141d0c69266e909"; + sha256 = "3e68e136d8a9a1522fe6477fec66df20fb454ab017d9337fbaab39cd4e607192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fr/firefox-96.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b630159914423bf066f7b5ba22524731ab69e05a96f00f11c803b1aa91e24dd6"; + sha256 = "5b1b622c122acba08315918969dfc14f952de946e121c7c037d53ca422fbc3d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fy-NL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/fy-NL/firefox-96.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "85c3e5a6bfcf6275334878ecbba0feed4c56033e2874dba1ee322d37f157de98"; + sha256 = "c6588dc0436e8c96fe2660c356bd26dbd3065f04ab439aa034a154c28e5feb49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ga-IE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ga-IE/firefox-96.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "57dec3d400e4525d65e3867c6e128010ca8b9017167e41a5ebfb70fc6041576e"; + sha256 = "d289f690338b6191f6da0201745d361915c83839f829375913a004bf63482fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gd/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gd/firefox-96.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d40c385478802645530b18d5340e7a37daec86fcbb265df224869bf944c0aaf1"; + sha256 = "f007344cb0ff1a2999d87ab4563cde87c2afa416cf3e20f7c369c9e6d4f17193"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gl/firefox-96.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7c9c4974907567315bec93adc4985367a5773cfbfeb39fb31270b6c21f346ab2"; + sha256 = "d42233e3a6cce9d0464428bf8e2dbaecac1eebf2c03f58e0045f971d38a2d844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gn/firefox-96.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "33f2312e3368ee5bbd09ad397a16d5b1b376b91d75433575b8ed7d995d263ef9"; + sha256 = "333e9de73b08a2c86d3491ff15a39312c63fcd2ab46f45d271fc37244242f39f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gu-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/gu-IN/firefox-96.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "bde662d7941d6afdadd84ad8c8b66e6463a7d7e20af7c6afda7b4f4a9ff23538"; + sha256 = "2ef9974b7281e17ba3469947365b299b821afca28d5369c374e18d9498a5d15f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/he/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/he/firefox-96.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d983738db39c773b3d9edb942d9ed6b202943fbcd58f94c21d7968c0d4526354"; + sha256 = "6df30dc08a3f85cb1c78269d05fc56af9651efed5d5bd2d09cbd1eba264e5eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hi-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hi-IN/firefox-96.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9c5ca38a1ed0e7f20606e9e67139625f9c3896eb95f9f9f6c07271e1eb231cfd"; + sha256 = "1ddb67ff888a37dac8e92637a051d3cc4f632bf3b22d05b91bd58bbad223e04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hr/firefox-96.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3c372a95a03d12fc53f171de4a652ec083efede32d954c1a5aedb2c699000d35"; + sha256 = "85425e1a026d9ae2a5d55b0ad2b355a715e35904ac88a706f027dbf18ba11a0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hsb/firefox-96.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1c68037a98166e5c1332c45e1c583cbe266baa88373d921656722bd9846423c3"; + sha256 = "abeee49422541d11d2eed2d159b7f20f3f0f36b7ce82505a2991368275f6bccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hu/firefox-96.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4a0b9577dfd5be293ca64d7311fbcb0cbd46d9b300bcfbe8fc89ac7726f6b71b"; + sha256 = "2c42e7ed59de20b5377c37a41bfe083279f0e481c61cba6249790ff83ce2977a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hy-AM/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/hy-AM/firefox-96.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1b3c910074db508b7ff0fe120cc1ac52bdeb36d6ec5f2bc931bd42ce81aa5ff3"; + sha256 = "74a0b038ca4cbccbfcd276b299ed0d127f4d4cdea159789cf01313095ee8874f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ia/firefox-96.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9954901a886af4e290e64bbb6f6787436182850dc29f5e246c9a53b1df10ff8e"; + sha256 = "c711c1cf38ab231ae74404852999d74e4d802f36c12e44835e9bc6916133eab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/id/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/id/firefox-96.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6f8452d04dfdfdd013c18db31f88934203c6d3321b34d6d92dcc393ef9cce523"; + sha256 = "e03819b47694a6ded168212877294b187f3e3218ab78dcf888a947d90479fc30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/is/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/is/firefox-96.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "fbdb3b7fa4ac13e654d5b1be90a7558c0912bf6288ce4c3d0214a4cf53768a45"; + sha256 = "94eabb7522d56e732ee816a7ee1236307d8dd7ebe22fafa6bf4a3ae14d3a0d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/it/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/it/firefox-96.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e9ef17a0a854a1616d37fa684bcc8f9447cb98eac9232b70adcdc3d61d3e558"; + sha256 = "5b73da04bfd5601fd199e1ad32cc02b41ccd056551e3e14ae975ae401baebb53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ja/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ja/firefox-96.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b278b661cfba935010b827564ba4229350b692e5a0cc6f04536fe38d16c6f37a"; + sha256 = "2e8992b199d36c9857627942b43d3472f56e7657f929dc655cd4bc74b0441fe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ka/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ka/firefox-96.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0dec6bd016fa636a1422a4d705bf5813e2d717c865eb1c5e1bcaf539980be89c"; + sha256 = "6c4059f00b2598bc28755f8051ef20159cf8cffc9732f1644822769799e886ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kab/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kab/firefox-96.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9789005dc9c6e708fbcd5b0dc1d41ae92703f8aca99e77a5b9ff82ec5e901810"; + sha256 = "730e62f6d18da4519ae2ed46266d2014fd44260549d8d2dd4d0fd8b6174a2831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kk/firefox-96.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2f8265737bd4e9f77e346caf56fc442c243e4183a6d679b1dc2a602617b94741"; + sha256 = "a7f4afdd9d43f0bfec34edf17dd5ff0d68d529731b51deb86e2a09d85e7b86b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/km/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/km/firefox-96.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "25181612508656ba6ea558d3085e31860bfc70196d0011478885cc46af1e310e"; + sha256 = "c69f54f1a9775c76f7126a18c5c8c66f683737076e3e59479b3e36a34a6c30f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/kn/firefox-96.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d8383e317ba7e9c599b87ebfe15dbe0fd45580fe8faa155e62ad466d883a405d"; + sha256 = "c9fb9ff1e2c79dc0ad804846bbcccf608a09ad380932bd7d68267e10cc9eeb65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ko/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ko/firefox-96.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "64a359934fc21a3d3d4c6447fc3b869ddf017356d1dd23ee9c71cafcde7e80bf"; + sha256 = "43adfc767b7869adcbb2d39410813eeab6ca7d50df6398bc00106f1b73daa564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lij/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lij/firefox-96.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "372f106a7c5b0f1499c5562b51918e9ea349018c7716677629ea984f185eb27a"; + sha256 = "812ebc60c69de188a12247cf82881824ee0efff571b91527fc343f50f216c27b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lt/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lt/firefox-96.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "05b0f431719ab8cb7df2e803d824bd42c0b30107010bb037343852c265460cd4"; + sha256 = "375ce82258424250c48051f33551958adad2b72bff9c06f2109a54618fb0a038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lv/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/lv/firefox-96.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "946f16a920a0581c7a201b3228c15014d92ea94c2c6ed9d833170e4b9d029b20"; + sha256 = "5b27b13ae0406e6ac0bdd612ab8523fab2665b8e4e146aaf2f47a83712453958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/mk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mk/firefox-96.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c8fd718b2e61971795d7dedb687821d5a46c0eb88c0af67bff3272c03395660b"; + sha256 = "5215eb91572c7f863d79d44d23fff9181b1c910817d40383a83459d6ce0fffd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/mr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/mr/firefox-96.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "515b7b538e487c23e25eeb59d414a8a5b54cefa8f7bb4924be6327c8f9b9edf7"; + sha256 = "056491449edc305d2994f8eb985dad136d9687b3f0aaf9b95d134a352f72ea34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ms/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ms/firefox-96.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3a6af28c127183f75fdfbb4484d32230c4639ef8c7890d6786525900552b0ed2"; + sha256 = "eb7244a97611860167f98dd038e4d1f60c3b52a2cf81fdf93c2402d780c1ecfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/my/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/my/firefox-96.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "1aca62c666431d987940852d1cda29281e30846e38a3855babd7230eaf7db5fa"; + sha256 = "93b93324e305b5ba0f9a005b73230de8acc6607ff0e284c5d3814892f95181a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nb-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nb-NO/firefox-96.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "04ed45b20776d517a08496bbe300d46c85c9a5c2ecbb74b03b0f22584ed506cd"; + sha256 = "255056583e093d4b733326f732a529ddbe18010b64e5a093e6a17e09953f6c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ne-NP/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ne-NP/firefox-96.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "7a921f5c2667fe21cf62596e5eba8152c0c68abb3e81aaa25d4cb134ca9efc1b"; + sha256 = "65fcb5475f2ad6e4e9471e4129ed26c615786e6b90c13e1f38c1c679b913b023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nl/firefox-96.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6379dcfb0c3a739dc65314531a425f03483f2b2b2359d89ddc8924d74a349743"; + sha256 = "1197ff7d9bb843d56d081da51105283923768884cecee4ce9cb50a93952e909d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nn-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/nn-NO/firefox-96.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2872e3a05a7cb5dcc974f0f11b785207d21c76932958d6c6b0f3da73f73e4351"; + sha256 = "47fe60e6c0115914630edf99a56447f5a1536da0e55e6253e58e4e9ac54c9eec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/oc/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/oc/firefox-96.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9ee1a08401c0a605ba42d90c3c4e297a4f295357faa82bf7b99950cfe6bbfa16"; + sha256 = "17d363269d5b0911d47ea3ba52e9a7b28f911e4f0a1eaa83849d749b4bfe906c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pa-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pa-IN/firefox-96.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "97f250aac0f6e096bcaebbe50e3482554454746eb73868e323fce73e72781464"; + sha256 = "6c1f582c50b36055fb9f3b8c20db1bc823cbd2d56cf36c8495e7c18599a906a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pl/firefox-96.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3e1a7c882c02907e39b6bdc4f21899bcfd3ec21c66425727f8db0d3e897ba8fd"; + sha256 = "e4a1fdc104a58966e760a1ea78bd353f61272462920085c347693adbac769d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pt-BR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-BR/firefox-96.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ad31fd6dfd33647cfc2c886b99f06d868c9de3684d601ad39a0e16ad42fa98a7"; + sha256 = "90a1bff86400f555d284fd8094df9d7c13556ebad0ce982710508d901c6cb1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pt-PT/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/pt-PT/firefox-96.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5a61590a49cebcac6ee9b6bdca80adf77458aa49eaaa989dd82bebfcdce6da1e"; + sha256 = "7e59d9ab9369f8f7ef00b85c6c6be62b4bb9da488071268ddab808367541892c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/rm/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/rm/firefox-96.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f03d956145c0780500c4eb5bc244f85ef826fe02606ac3df666f70bf6c8a28fd"; + sha256 = "ca20e98f9703ccf00cde6793b2e1d28c0c429c0fff01a2eb592e4270181e8c1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ro/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ro/firefox-96.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "42c514d296923177bf9b19a961a6cc322f5c3970dd42de583dc630320daa139a"; + sha256 = "55ac07f7ffa919ba37d29899f8fcbb13793db9f198e2a9cc0b5dda717b1d4116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ru/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ru/firefox-96.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "90247a6c685b3bbae9a1073b9003239d5185927c68e75b3399b27af1c3702ed5"; + sha256 = "f05ba84219501f904d51f320fecd84df6c51cb1f4ad541afbdbf8a781e46699a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sco/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sco/firefox-96.0.3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c7d3799d03df9e50e57b1e2264196962146ca9bb953c8a2610ad62927426d07a"; + sha256 = "5186773e72363dd05e46ba418e58a9e4d80381fc530c509135c76c5e63353d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/si/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/si/firefox-96.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2e27aa9eb0eba899a27d12a1d6ef63776365c06bafbfd6d3aa3c3ce2418de05e"; + sha256 = "8bdc526c6d7b4c672d12c860376458d03efd5305f4823405c0827a4b75912a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sk/firefox-96.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1e4ca0a7d7c11444a31de6dff04ef4a98ad92e6cd30187c7287c01d570bdfa48"; + sha256 = "bb17d52c6c549dc7861c32ec9a4f57a0df323845a6076a9499c1faa9ae3c8d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sl/firefox-96.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "59307696ffb8727e95cb2e390e3d00c31a590cb0d5bf5b860dc516085ae57755"; + sha256 = "fecd2cf24bed949a02360ae74f6701ac9b65186a7a51f851249a2cee67ccb63a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/son/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/son/firefox-96.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4b1c5a2a46570913fd6784e91f2b55db39666fcebdaa2b56684e6f1d674a4abc"; + sha256 = "c3130c49ad77912107c61d0b24e5290f20ec7dcf95d329682a0703f43c768c28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sq/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sq/firefox-96.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ef1bc449a6649e8476beddec58ca363601b1ff09a27ad053a0c576e7f9375dc7"; + sha256 = "4cf2ac0f3957a205a26548655f00c3af0c35751ff6f69d25e5a38dde86dbc335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sr/firefox-96.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "76e5cff9bc3001c7ae66b3971ee6b526ca52a04654b98bfa8f027200329123bb"; + sha256 = "7f3e01919220b39029bf48c651864dfe9970c858f4c379a0a458bbadc1cea666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sv-SE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/sv-SE/firefox-96.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "efcf35ec4f65496f4e1b81cd0fb6ebbbf460dfd5257ccf44d75547d4474f8f23"; + sha256 = "bdeba12b07803a1bf86c7e38185fc1add59a10e09ed59aff7d135107d004f0bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/szl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/szl/firefox-96.0.3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e62f290ab601c5b4899de0115a476a6e5c6fe854a89c2555a059de0e9ad4f446"; + sha256 = "f6b69c4e88e23da50b4f7f3b4961a92ddb3321dab8a988d29150fc1ad60258f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ta/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ta/firefox-96.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7eba2c9394ea70e3cb1d56e1e1ac0c3d2e423fef6b6ae523962ac5f13f93f0c1"; + sha256 = "d7bb8645992788ac5161f3becf98248526b02b767cff958d5094ad24086cad06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/te/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/te/firefox-96.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "f66730392b3a7ca2480b997288ef3502636722314731a33e930d30490c762715"; + sha256 = "692b65313b3b792e35b1160ee830fd9c9ff082d6f6177af7be135dd6096efe09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/th/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/th/firefox-96.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9dcbc894d4cbccf0132808d56a4b1f45242bfb439d9219315ca72839ea46c5b4"; + sha256 = "c792a126f487b51f4832a56fec8a6fb502fe3a0a38dea7a8f3c5a7060b9d7576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/tl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tl/firefox-96.0.3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "461a6e1f9107973da675594cbde1c3371f3636eb7f0bc1287f162f6b8e6b7823"; + sha256 = "ef633b565abf5349aaa86afcd9934145b70abc036bcddc733075e5157a736406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/tr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/tr/firefox-96.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d3dabac4567b81f988d209c094b7e80db12465f62622c21332d7f05e4e26fedd"; + sha256 = "ef04eff4e101405dbf8291b0384f8ecc95febf6730aabdc28d8c8cfaf305810e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/trs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/trs/firefox-96.0.3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "0978b21a644764974d2bba3a532d3ab5f9ac66127cc51d9b0411016c6778c696"; + sha256 = "0a5c709f86dd33c771aec4760a5df1dbfd7baade90c8d9519c46a1dee8f18aad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/uk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uk/firefox-96.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f42e4a326aa1aeb2e2d82bf2ecc7c8d38fcbd613e090736a047f4f715f955727"; + sha256 = "488baa16c6d60043d5da0aa667e3973eb0df141d50bef117effecc2a39a30019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ur/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/ur/firefox-96.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bf863ace693a73a187867600ced36a26e9236ae94b753a3c8c6f20801b49f2b0"; + sha256 = "039278fc25b62c6ccc024965ea296de4381f86c485b10cfa93cd5025d39f7e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/uz/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/uz/firefox-96.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "89044b270b36a97b9d39350ea20df1d1cdd19628f048a4fb908316a9b081393c"; + sha256 = "59c1a1f8a85f1f569112df4dbfeaaf15f4337210f50111193b36bdedf4d3b2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/vi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/vi/firefox-96.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a983b8b260feb7777e55fc3022a130d7eac1e70c2d2472759009d3154ef208c3"; + sha256 = "e9a1a2330b1d09ae8f9ecb95613799db87a06f7a4fcd70265ebca2a6aa179bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/xh/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/xh/firefox-96.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ccf3c8ec1c3aa9401693398deb82ae3a5bb3d4b085406f4f9986267309e04972"; + sha256 = "8dd8816267c62f309206a45cab60bd6dd4d067b0de3002111d86b737f4f9d11e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/zh-CN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-CN/firefox-96.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3dfa8a328952a2072431d8b532c0c47312e35bf7dea70c45344fe5198a2fc1e7"; + sha256 = "b080362a5fa2a660770698915abbbc9230d85ce1eb3510e96ff9374ee19fbf94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/zh-TW/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-x86_64/zh-TW/firefox-96.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d9028ad8fa1467c8ad16d16d758d9039cbad8c9de03f8c730680e82d95ad49e1"; + sha256 = "34f43a3dc69a116d5b9a136d89fe0180deee13907a94eb6d02ef2ffacb94ef49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ach/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ach/firefox-96.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "117b128a7a24f7b582ef47afe4f1277f8c41e56cc2dabefa9e2761985a922c4a"; + sha256 = "b2f21e188e6ab08be9b57a1a50dc735c50cc6586a70c3243af1dc242def66f79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/af/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/af/firefox-96.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4d7e19a89324ccbc740f1466b425a7ee8643c61c2b912e8c1682d26ed2161b8a"; + sha256 = "c153b40cccdb36903e3ced9d8685443a9dd4550419b45f09c201fc5b9ef2d12c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/an/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/an/firefox-96.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "025f3022d2d1147c0d34ecdee4b5cc569e9ed4a0bf06f1d6ab57ec897bd1ecfb"; + sha256 = "0514725b38a83e6385362dfdac57b7d374a458e6621296c4285d769933aa7bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ar/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ar/firefox-96.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "551fd200855a19e9a6f340143112011e02b148e01ab1e7fefaeedbeb9db6e464"; + sha256 = "ba1003e913322f06aa113f61d6de5ce52e08bdb5644fd6c5c8d9f059765a7737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ast/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ast/firefox-96.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b0268f0f8ef786c7ae565bdda7bc18c40abe0c88a697c477532dad777540db3c"; + sha256 = "c2983efe1ba2b201006581d10fa629e2704f70590290a2720817b49ea3cb6ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/az/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/az/firefox-96.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "69b7da590e9788548fe4acf2441780ad9aed2e896f799f9f38e9e49b8613400b"; + sha256 = "b4cf2197f83835fb580ed79e01851e7be2d9d7e319e1dcea3028e075f244d6f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/be/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/be/firefox-96.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1b96a70a6dc272e5a97df6a83598baf3065c54b02286a77df1cf459b750fe400"; + sha256 = "519c34bffab78065fcd3b9027eac4e0eda7ab864784f98474dcc04d887540bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bg/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bg/firefox-96.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "06f3e54d8a0dac7fd696c9e205d57dcc7ff3bf61be8afe0e125ed94b6cfb0dc2"; + sha256 = "fc897672d9eed6bcc835fa3e9e6e7fe07214192fd6899b2e7f85d64a0fbb1179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bn/firefox-96.0.3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f6e416409075720bd440163a5f852a8b9e34684de966fe7675733dcd3cf1b9eb"; + sha256 = "67550724f06e82f430e398171715a96eb2b4aa6e902066faf7e7a1efc5bfcbb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/br/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/br/firefox-96.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8d9ab421a13aaf130b2487e3b2ff0a4c68da19ccc019ebaea9fbc506ccc02ac9"; + sha256 = "22d15a81ee580824465ff2bae1f134efc4525cb2b7e3707c365f8b720f8511b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/bs/firefox-96.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3348a5431c072589366e2226b096c24c5c206dfd088f475f6814b56a674ba8a1"; + sha256 = "0d2bca33d770c88b808c74f3178e5f4782424f804e59acfdb884879e195e3ba4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ca-valencia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca-valencia/firefox-96.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "38c46aa9998c09a5498115c2747bae7af74e79aba3e84ae8030979eb566e67a6"; + sha256 = "3214ba1b640b1802d1a22c0a76ed5a26f0f2c23785cced7ed1cc8eaecb0c0030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ca/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ca/firefox-96.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5e1f0a52844e54f689ddd8d101a1a35373aff57d2123bd764808c5e6e00f9a33"; + sha256 = "07fa269368d120c547c6faad6c896c73cd95cfb1a99da9bb7bcdec1453e4c898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cak/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cak/firefox-96.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "0bdd0ff060093c85c3dc4ac690b4e8e094165da76c1cc32df0ce2bd738f6d629"; + sha256 = "3350662d19a2f4bf68688917c4b37565c9049f22c272ed860e1d47f6f11e3be0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cs/firefox-96.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7adf999a82970a477e174b06bd20d0454a72fffa8e3ee3f21e72d02850069918"; + sha256 = "2a70bc5fe26c427ac4d0c6ff75670dc485d9f4701926572ff46f6e6044a94d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cy/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/cy/firefox-96.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b8aec416d144b49395230194f056bb1749a5056adaabb132ff95da7bb653cde6"; + sha256 = "d5e4177638e84295f2733357548791a179cd32e97c1080666a6b48270236f8e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/da/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/da/firefox-96.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6f1ef67a6394380d948e0365610e81e2fc0ccf850d6167f90c258c26cc363598"; + sha256 = "3d31f922d743c9ec84841bacfcc563c6c71716f75cef8b78b5331bfe6916dcb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/de/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/de/firefox-96.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "efd33ca5b825d9d62380f28a0ce6f9e4d1413570eddb94922522e8ac5272b8f3"; + sha256 = "2e1ff6056e589d420ae813a448317de248910694fa89ecfdce9b5545a647e2b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/dsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/dsb/firefox-96.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b426f1945115787abafd1d91dea98e1e5b420a017cc596392cd4df7d246eb580"; + sha256 = "73d2c7e568d7e6bf8831dc4405f407357e3066896446d3ea2bbaf7de45c1314f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/el/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/el/firefox-96.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8b9882be7db1ed6442e46fb47d8615ff1f408d95472cc40b96b44f0626907983"; + sha256 = "1669c35b9ab66367d998f1b15556ababbb3b80aa191bed6a7b7f34c6f29fef1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-CA/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-CA/firefox-96.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d73debdbd205a77d813570072c900251da002ad829b62bda7921e8ae2b749876"; + sha256 = "c5aba93081eaf416dab845e0e8d2e5db10992c3aaeab209182c4af2e725dc5c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-GB/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-GB/firefox-96.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a523d57d573b59c1ca4be7912c2a84b77db89f50417d7064f041474fe270d95a"; + sha256 = "72acf998d686d34727ca307855d3c0139c620868b13614ef5c7a61953a3c2ac8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-US/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/en-US/firefox-96.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0bfaf456bdcfa41e0ca4c45718734a70fac419f29edec41d3357708f38813240"; + sha256 = "096169898ad97b2575b0b5e07c012f55f8749b7bc85f373c276d97948c3b7e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/eo/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eo/firefox-96.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1223972105ead68b14903d9bd081fb23fdaa4cd6cfb8eef970253e64b467f141"; + sha256 = "365611e7265d56b3c9bab3a6aca71b838d48b945119b710624696080170443cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-AR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-AR/firefox-96.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "268fa9d6a476dbed0f2f20ad32d3de8784159dbbfeb8fab67f22088167b3ebe6"; + sha256 = "49a54d184ea10380fac710f49f6c3e36c2e338e5324acf94b39535f6e06c91ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-CL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-CL/firefox-96.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7c0b04a76748c77f78e629b4ece02ba8c9b237c229f699584408deb975a618cc"; + sha256 = "3a5fbabf862c35f29db2c325e6b2e89af8a2fafea9c6613dbe4f367ce07e1abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-ES/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-ES/firefox-96.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "59d9a063c4e072f7db25fca31b2ea93bc660a5290bf0a52b6936e3b7f6526708"; + sha256 = "241fb3c9a2d07276085d586cf51fc55eaa6293d188ec286f25c6f58eb1919f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-MX/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/es-MX/firefox-96.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f9ea0cdb41fba2b058df9a8547fa626f368c820de40a07a5630e46c751f09e0d"; + sha256 = "066bfc95073b28afbf61accf2455e3294281749eb048bfab0670b21f920e51bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/et/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/et/firefox-96.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9dd85d7102378cbdf2a8307fadfc3c875ac7586aff93592a026fec03d924cc76"; + sha256 = "437b61d073054cfb81063991c03afeeb5be52a31bd4f3bd1a2e65bef0c92a1d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/eu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/eu/firefox-96.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fb7de46ac3086baa493410aa184fe2e8af2dcc74d516f702a019bd091cf93563"; + sha256 = "bf998de6b1b2dee067ee05d0a28d0128f63c9e6e7b788181d785b8afce8b0789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fa/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fa/firefox-96.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f2036970faecc4e37e80fb8a128aa35ad260ed6774d42b4f1b797e63dbe756fb"; + sha256 = "efe1cd9c8acbb8cdd8d72eee6c81f100c17c90fe0e13784992c5cfbe712a1eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ff/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ff/firefox-96.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b4d4cab79e00bed477a26da373e134fe319ea296c46ebcf20e5e92622a241bc8"; + sha256 = "dcd0dbe923403f1b078695257bb2705a4be9c91ad51fe065500ebfdfd0e8bf45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fi/firefox-96.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8185c38f9511b0b38a15679c8e4965d29a6f3f0dee94f1c3c7b51d1f46e175c4"; + sha256 = "8c2288c2c7e96e2176b005227c504d7be001e03c43757f9e945f8a5a360dfc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fr/firefox-96.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9ca5fa4bb1ad4329ba16e3926d78d59012f5c602f076fdcb302714e843dd2d1a"; + sha256 = "dbb3ebec1fb7da951c30d9a9fb50d59fe4b10cc56354c6d988708b4912092ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fy-NL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/fy-NL/firefox-96.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4f3e48689490a883f68e5501759d31f7f415897aff6bc435265ec1ceff4868c5"; + sha256 = "510522af3fa4c2f264223ac1970222c6d77abee42cf41ae1725f615bc519ba0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ga-IE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ga-IE/firefox-96.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0b6eba35cf420252b9864b51785f9ad3122fce63e73dfea103619c6a4e9b2ea0"; + sha256 = "82225bd4f8a00ffd38af9c4ce19cc3d224bcced34f6523cbe02a9c7f3d228697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gd/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gd/firefox-96.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "62d500428de85366503c11beb87370d67bbf0cc26a3396ec22535f6e7c731fcc"; + sha256 = "5c11e2efaab296b436c6d21c7693612b910297681c49af90d376d9e1525b1aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gl/firefox-96.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cbbdc4165500ab3dcb10035b3fcbef5ca84612b8972821f2a9c974c55bf2de2d"; + sha256 = "8895ec691bdcebfc5eb13ef4a59fc1e08bd7aebd8ba336fc2a99db47608e03ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gn/firefox-96.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "376ef506f3197384d4f93bf0e9c535181c82014190c881b0d61c957016b455a5"; + sha256 = "fb6f99ee38f85d45b4d529934acdb94e804c5d8e85ae54124667c302156523b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gu-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/gu-IN/firefox-96.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a2c77948f281162c8d430f5b5e3ccb1cd787e2b57177987a2b1a55c2f4c6c617"; + sha256 = "69aaf403dc5fb15f92b95175a1be399452cd06ab751d3c6ff2a78c2ec9ebcab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/he/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/he/firefox-96.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "89cd9df5f34c129e9cb6d8a2c5cd964608f798a878aa2b695df00f8132fc12a2"; + sha256 = "eedd4f7d709b56e002f8f9955debe3bd4b2c4caef61b5160af78a44677f44530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hi-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hi-IN/firefox-96.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "aab1f42deaa1cfecc31e3c7cb5f604da1856363f230ec61b921397838fd86b48"; + sha256 = "3df9f781a68686c430da2f5aeafec68b983e1a9c64989701a78cec7a25830202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hr/firefox-96.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "bd585129e356ef3777358a38a86ae8452a5b86abdd9b28778d12ed73564561a4"; + sha256 = "e809039217112743f459f37ae9b8cda21bb63aa00a23641a5f869a65ac55a527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hsb/firefox-96.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6895520f5a675d5234b1556823684c6e26b7fa68b92b63931f28995face794ba"; + sha256 = "4ee840b8014aa7b0e8ef5262ac2d69e48049a7b2beab803ee7dc09c35dee8f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hu/firefox-96.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ebfe02bac09e691ef4dc2b2c4e9710816d629b30bfc9a799f47adb81a9df1ce7"; + sha256 = "8e62842f1be4afd2d61c0ef9a9be05f6e3c133d1994a55d8b165d39560d96018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hy-AM/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/hy-AM/firefox-96.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fa1bd0398ab30da697189fb5ac3ecc641bb63c42917259234e11e4fc1d1f8710"; + sha256 = "e0fa7cbc6bc4679585ce832f8cc1380e7de0cb0ca46b93293c9ba08fb04f91d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ia/firefox-96.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f981b9d9e290fd2efd8627a0f5e831de59d4d62833c0e5dd4c2f249791233d51"; + sha256 = "d20630531aba75aa0641422fadcfd2d3bc663fc817c22641a63e9bfc4cd29a76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/id/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/id/firefox-96.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e8b5511d6e24e783677a4e4766151943283ae9b6b7047cf380ab33d7d557de80"; + sha256 = "b11550957bf6caf0f088e5791db67f7685d4626f7535691c4201764244649fd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/is/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/is/firefox-96.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3e2eb36a19c5cbf69d958d7f19c0938039f1c26fc94ddd33696316cd709f5298"; + sha256 = "d9112f5dc6c3fbc415d9bb9da52f36dbce325d36d8ec1843cf96b093d19d4b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/it/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/it/firefox-96.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0365c8a8395cba72a2f57a65034c00c87e1dd392efb4bcf073812efc49713225"; + sha256 = "35f4350d1cec94cb4402b7b22f11e929e8a08b44a150f7910f278c9a5cb77324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ja/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ja/firefox-96.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6c3d8d2f71b3e1d0d5e270008dcd53ada5106b3f5239d2f2039eadf03b9dc076"; + sha256 = "5fe015cc6d0250500912187edc04e697cbf62028b447e47e8d1532dfd0628d2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ka/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ka/firefox-96.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a63591cd5b0ff79c2ab0baf125cdbfff0baac178dbb8fec5d50c313e2d63a4d4"; + sha256 = "a696df24f1b95e5b228f53328514c77639020a8719cdb23f88017be7e6d2a037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kab/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kab/firefox-96.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "80e09564908adc6fd6219ffd58ff2e4f91da04a42ba2535014526317fb63763f"; + sha256 = "4d9c7c0cf22aacd5c18f75eb511db2ebffc393019af1f01fb5d1dbb837da96a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kk/firefox-96.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "382fdf810ea304cfb12d8d19c28e407a404c75bf09770b882abdad3c5d101eb8"; + sha256 = "db9c1eee0cd6a696e24b7edb142aa3f04a89bb3b30ec46e76be3738e3787bbe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/km/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/km/firefox-96.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2ff261744a3d3466086d175c860b7a7565848870e77bbd8af93bb1f0b7b1baea"; + sha256 = "e05b5a315de970a2bb58276204a341870d0028214b2a402eef5db36ce8ca8190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/kn/firefox-96.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "bdd6864ae5fa723f47d029a0f0d8265c865b7635d33aaed9003f26d4962ba34f"; + sha256 = "1c60915882ba74ddb257517036932c154a5081e9418b98e0fb533f1c71479eaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ko/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ko/firefox-96.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "643a9b2ed25c15a3e2139af4cb80e249dd8da3719a36cc3d21549fd36de8631c"; + sha256 = "1c69656cf1e302973ee92d9064388cd537b70ca8e36882b2aba5ba477522192b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lij/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lij/firefox-96.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "326260fd6b0a996016cdbc0668cbd819199cc9f39584eb81e46182032b2e4175"; + sha256 = "bef0d7289833480363ab76d610e2cfecb286f5ed614d910ee84c9016da358c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lt/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lt/firefox-96.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7888d9db18476a8f5d1e6bc69159b80266bd0bc58e302c66b3aecc6bb304871a"; + sha256 = "738746e5e17271ebc97963a890e6951c9338c7f9bdb6021c3db0de1f346eb66c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lv/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/lv/firefox-96.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6c6eb3f523fbcee8342de1d0a159afa8a182621bd126e030ae0bf663fc7341ef"; + sha256 = "d16713a766aecb20428d6642805fdb94a70523c0eb557b4a143c60afbc7ab623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/mk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mk/firefox-96.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d86c29d3a883d7caa7b6d5eacd43dbd7c25ec2cb01f8cd6a2a81da794bb4e7e4"; + sha256 = "f04eb09a5ccf6fb017a652ed8016d2e6f83202acb1f596a9f1b972caea8bc6ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/mr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/mr/firefox-96.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d2af69b599ef0793361909104e7ad7889f86789e534dfee13b977a044802a834"; + sha256 = "8cb8bdfe8b57fde90425e242de2a6c6a2fd76341efe32017febce6eb8189595b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ms/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ms/firefox-96.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "8876f2df083506768b674e20d43e4da2c0d54f717fc4df306c3386548ae42921"; + sha256 = "785a87e3cbd7521913c47b9ba0f3838ee44e729df17680d780c78735c2ede188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/my/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/my/firefox-96.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ce16c5c94d81c3d0b7cd763123c97ef8e56bcd01ddebb616ebd1ab77d37f1650"; + sha256 = "6a555d259acd118123630f2da9c82c72fb95208b6aa02cec36ee8f803a94db82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nb-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nb-NO/firefox-96.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c56b6baf9439af5612e4b141d3af24bc12b256e93f13775f3e6d98065bea079b"; + sha256 = "a095c6f9991033a60015416f049e39f403368aafd85b3eb63dc3b7ab1183b9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ne-NP/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ne-NP/firefox-96.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8c9dca9eb2f824697a66cedf1f3b92ab94b312b1463fa72596962b7aaa93cfb6"; + sha256 = "3e3d546d2c2671f026414c809ac29431e4497a609c429c549f3183b101282766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nl/firefox-96.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b20a48a30c36750578b1365837be5bdb190f338a046c47748890edf96c4cd661"; + sha256 = "5a0f987ddf354053e128a9c4d27b0eb73df227569643bfdca211aa2d4aef9208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nn-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/nn-NO/firefox-96.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9b7c79689c11d95acecb34a9a8022bf197384dc79b229fe3e648f92e08ab58bb"; + sha256 = "736ed19fe6aabe0db06c3b5ba8971b9f73ec7014d876ce5fc0b5caff491cdff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/oc/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/oc/firefox-96.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f2df32774438f105d67a80e8c3c0ef72b0606dbad796b34ae60f48942ab755b6"; + sha256 = "abde35c0c8ec426bdf5b35d0d19d2076fb72091939dded1318af90234efdc795"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pa-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pa-IN/firefox-96.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d5e66f3c0f9c3a554f7c9254f46f15e2e087e1ece1a6cd946df03cc1067b42a1"; + sha256 = "f40fca6a7f15b21ed61ff1293f9ce26cd4331736c4f59dc3515fa895176a15af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pl/firefox-96.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5eb5863b680e85e322d92cabed13683264d1503e596ef604cd60ee6c9a2c30ff"; + sha256 = "37dbcf64865442c1e42d22cb926888dee9aed8f3d99e08c8a8da3fc3bbcc18a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pt-BR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-BR/firefox-96.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b1f14be92a6e861fc7dc04274d9260d863fad697ea3bd5b39f2254430ca5999c"; + sha256 = "60059b1fd78fd5dbf4df958274dc3c272142b4daaaf7fcd527491674bafbc234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pt-PT/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/pt-PT/firefox-96.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e72d8c50059ca2b87f7f75d53dd8c3e8523792326ac1b245c012353a11244023"; + sha256 = "958dd069404ef0b5aa3426c0436f7cc2fb0665d7aeb17b894f555baa875b1808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/rm/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/rm/firefox-96.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47809c62aa91491b0856c1d775f700197d7b97b6b26d1ac2e41cdcbcedbe25a8"; + sha256 = "5d1379af25c004d0e16b3763fe2a78ddbd766a1ed8d3aa966a71bf44b65a8140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ro/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ro/firefox-96.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5517806008befa780195a69a8f5a0b1f0c21b9e93ab2acddc6defa58bcd5ca23"; + sha256 = "11ac629ea7b38db0043e9563fc5d75ea26ad75b0a3565d12798d56d2c7256992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ru/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ru/firefox-96.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6a2050e7b67aa42b5deaf2455daaee8294cd987c5b7bbc95f6055e7c767c29f6"; + sha256 = "2cc4cc849625dfc20a3dcdfa3a964218b521d4271c0cc166312b016948944b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sco/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sco/firefox-96.0.3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e6a0ad3eeebde291d3196ea98704708bf23f22ee51df05c6d3e8170a97be7003"; + sha256 = "956160210c34a207a129a08667c3c3a3f978ad444a3f524e5cf4ce3406205c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/si/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/si/firefox-96.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "61d878e6e91a4aeced23cbdab43362fa12ff378b1f71eaa334fb052894cff070"; + sha256 = "68b2d054ed0af6e2608b42f958e5790d22552882ae2c143fd5a35b755232577b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sk/firefox-96.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8cf44c88119dcc189e3792aa0da589f539b7986cb909c690262ca27d8f354cdf"; + sha256 = "5e5f318c5783feedcdd155afd7b2755fe0db513766378d823bec141a34245d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sl/firefox-96.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36799bbf527451d66dbbe93c9c59ca2f2b57c9a7541ba5ca26169eccdce67e76"; + sha256 = "75be9829bc9b3e9167eac5c24a9c1d091a7f932c99c496b7a07c0d438523ba13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/son/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/son/firefox-96.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a40fdc44a5dc12fe62a4a86d88c2ce970bb95d20d8b9f99f6826339ed286129f"; + sha256 = "eb18e65b5ff61953e8a8a2eff766dd13b9ecc5ce66179108eeb919b64219efcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sq/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sq/firefox-96.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b40fb49c73b5d1d6c0784b94f99bfb9804c0c5dfb40f579dc58ecb3e1625733a"; + sha256 = "e21779796d19e344b518cc06106d9da298430dea03842c37e7856676999e57f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sr/firefox-96.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6f91b48edc1a158c0d3e9413771d4de8086bfc271ce353a7af5849f9ca8ae969"; + sha256 = "12ff3eb22ea684b81909f9c03a4ce2ea802d6160bf1b7b939a808b28ad042d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sv-SE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/sv-SE/firefox-96.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "24e91611cbeaf0f4276e92f7f2eb8fec2138daef6928ae0520fbac941eb80a67"; + sha256 = "ed48713a2c50e806fa4ecb082bf87765e00f4b496f7087ac642d4b7d5287a373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/szl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/szl/firefox-96.0.3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3ae32ba0b3543f09f3420d049818fac9cb1640585d7a28f1dd6716bc2f7254d3"; + sha256 = "0a8335399ff54640d374c0c1035a4ba74a0a88b3940c02e7351c0372be4efd3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ta/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ta/firefox-96.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f5c15f7ed3794950b59ecc53a1131225b47a9ca80b511a4ad6d8102c59fc1f2d"; + sha256 = "6d39220c2d88014acbfcb0d6ac93f1539a668b787a26acd31b80312f59f6be12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/te/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/te/firefox-96.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d57ec26edb702f4e266f312f58301291e8591f27e1b192271abb02eb1c0b2b98"; + sha256 = "f037e673f47ce4569eec2525be5c1b903ffe0df71e322eeda033c91cc92cdd0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/th/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/th/firefox-96.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2f8c857dc7a76dd6b67227db7c4e96a46731e62c94ecb4aea9fc0db02d564550"; + sha256 = "dc7aae98e8b4928f7b3b703aeca5d07aa1a820efb5bf34b1d07d9360b2eefbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/tl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tl/firefox-96.0.3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5c32180b070711556389f075b4534af36512402b27d1b830b7ff61b6ac6dd6de"; + sha256 = "1fac0d3b63677d85d1921a7b9a9e81bb45be52a63ddeaa679022a9178acb2081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/tr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/tr/firefox-96.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bae06b7dd30733e5577e115f38422d19446da1b0688285f7c42dad67541ab99e"; + sha256 = "d380b853b024daa0c11a34ce80c90b1840a2439b89b9f471ed1d483577c9e297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/trs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/trs/firefox-96.0.3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "abfda71628b8e1e2bde86313a40d6020af23375a35d5ca358b913018eaabf48c"; + sha256 = "4b143569552d987f05fa482c481b846398cc45fa98edb59b257764762198a5f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/uk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uk/firefox-96.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b3e5b473ef65142c874db372f0e91d9bccb98cdd036b6836d152763e3da9e91f"; + sha256 = "a6df28358b227cbc03887ecc6e3ef516a71b09050fed3ba19f13a7bba8fe7f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ur/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/ur/firefox-96.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9cab179f8d78ff1e560b8abfe16a9c706196edadbe89533fd5fdf249922c978c"; + sha256 = "0eb5d0680e985acc6bd5dc9602080c953a0664260e0ad62ba697b9a13b0282ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/uz/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/uz/firefox-96.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "69f13464ba86fe89e601752dbb0a65f3c9f2d1316708830ec049f0b98933e4b1"; + sha256 = "a1916a60680587dad773be1a63eb6a8959d84d08ffd3aaf9c062d12a7bb9f1fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/vi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/vi/firefox-96.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "87fbc304b7a1da8b27cc2b1e3d15c6206293bdc3d535a98afcc9020b5ed205d9"; + sha256 = "b4072149b45d7514af7260f1f13605823dc3420c5f45198266503f3a9e42119f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/xh/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/xh/firefox-96.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "cdcc87ed3e583f4a1720fe3fc8a9fa4d1241e999cd334c6caa9cf7692901807a"; + sha256 = "ed0c483448b2eeff1adac520be15dee6ecff162f0420669902e565eaf30e0dd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/zh-CN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-CN/firefox-96.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4c19940887575f104a1f54a7cfdf98899894a51242cd3fe619512114fd8cc22a"; + sha256 = "c1416988cbff23e6a68a04ff54b65fe11909dba59e9a0b2709a5ce4599a9d8aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/zh-TW/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.3/linux-i686/zh-TW/firefox-96.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0da0137f4abf987b7e8f20e49d6b04ba83f6f54e16d3fe9cb57ec2be8a6e6902"; + sha256 = "ee7b2c30ae3e685f631a132ef1992b6b59c189781385ef0823330ee24fd4d43e"; } ]; } 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 e0d75d9fc3..6fc369c60d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "96.0.2"; + version = "96.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5ceb1f023a9217c6a9c08b6525882d4091f989859cf209cc1d0ea22c846d05a967e1c47102ae052f7a5029d18118a558dd96da00437ee2c6fbf2896caf99d9dd"; + sha512 = "3dd5fbc96e369d5f4fb3eca778c2bd3e2313d089f867de9fac3556810a797e9b5629ef1b8840fb2f22a18df7de95ea1993eee052f691d861a555cea544b05966"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.5.0esr"; + version = "91.5.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1712415b6b73c6a21edfefc39eaba5fcbbca54032f78627c0005d291501d16ef4daffb8b9a160d1d5361113ceba04eb5ddb21d903e3dd8d58838aa9596f2d781"; + sha512 = "26239e7a94b79f1e24a6667d7cf1c398d75992e8850144affbc5d3f34f04b91f0c9b020cab662b2cd4927924839ff2ddd2f3605c537bb5494fd9ac0d951b14fa"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index e93ea8ca66..b0fc87a180 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -142,8 +142,9 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ - --add-flags ${escapeShellArg commandLineArgs} + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf 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 54eaf06e12..7ea8fa76cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.24.1"; - sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac"; - manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk"; + version = "0.25.3"; + sha256 = "1j7jw6vfki67dz9lkx3f94b9hi6d2bc504yy3nfppp3hx8nwxb37"; + manifestsSha256 = "1akp1i3xasfjq6zqbk7mnbkhnzmq7if7v82q6zdp2678xrg6xps5"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU="; + vendorSha256 = "sha256-/VeJq6l3kSZ9qcYf2ypyyoXVKME+rig6aDdWDoRqNzA="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 59d4a4ff7c..2d9545bc13 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -1,23 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: -buildGoModule rec { +buildGo117Module rec { pname = "helm"; - version = "3.7.2"; - gitCommit = "663a896f4a815053445eec4153677ddc24a0a361"; + version = "3.8.0"; + gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-MhBuwpgF1PBAZ5QwF7t4J1gqam2cMX+hkdZs7KoSD6I="; + sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg="; }; - vendorSha256 = "sha256-YDdpeVh9rG3MF1HgG7uuRvjXDr9Fcjuhrj16kpK8tsI="; + vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc="; doCheck = false; subPackages = [ "cmd/helm" ]; ldflags = [ - "-w" "-s" + "-w" + "-s" "-X helm.sh/helm/v3/internal/version.version=v${version}" "-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index c256f23dbc..1d2fdea35d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "237bd35906f5c4bed1f4de4aa58cc6a6a676d4fd"; +let rev = "0665cd322b11bb40c2774776de765c38d8104bed"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.55.1"; # Do not forget to update `rev` above + version = "0.56.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-pHpnh+6O9yjnDA8u0jyLvqNQbXC+xz8fRn47aQNdOAo="; + sha256 = "sha256-78skqo3sq567s3/XN54xtC0mefDY3Io3BD0d+JP7k5Q="; }; - vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; + vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix new file mode 100644 index 0000000000..819bf4741a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGo117Module, fetchFromGitHub }: + +buildGo117Module rec { + pname = "talosctl"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "talos-systems"; + repo = "talos"; + rev = "v${version}"; + sha256 = "sha256-JeZ+Q6LTDJtoxfu4mJNc3wv3Y6OPcIUvgnozj9mWwLw="; + }; + + vendorSha256 = "sha256-ujbEWvcNJJOUegVgAGEPwYF02TiqD1lZELvqc/Gmb4A="; + + # look for GO_LDFLAGS getting set in the Makefile + ldflags = + let + versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG + imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS + mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG + in + [ + "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do + "-X ${versionPkg}.Tag=${src.rev}" + "-X ${versionPkg}.PkgsVersion=v0.9.0-2-g447ce75" # PKGS + "-X ${versionPkg}.ExtrasVersion=v0.7.0-1-gd6b73a7" # EXTRAS + "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY + "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + ]; + + subPackages = [ "cmd/talosctl" ]; + + doCheck = false; + + meta = with lib; { + description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; + homepage = "https://github.com/talos-systems/talos"; + license = licenses.mpl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index 20623ac318..e91b517e81 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -21,16 +21,33 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc"; + sha256 = "sha256-jZoCjKn+x61KnkinY+KWBSOEz0AupM03FXe/8YPCdFE="; }; - nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ] - ++ lib.optionals stdenv.isDarwin [ gettext ]; + nativeBuildInputs = [ + bison + cmake + file + flex + ]; + + buildInputs = [ + curl + gperftools + libmaxminddb + libpcap + ncurses + openssl + python3 + swig + zlib + ] ++ lib.optionals stdenv.isDarwin [ + gettext + ]; outputs = [ "out" "lib" "py" ]; @@ -54,7 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Powerful network analysis framework much different from a typical IDS"; + description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 866b288909..c9e642aceb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1a0c25c606..5ba7a1f7b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -12,8 +12,6 @@ , Security , AppKit , CoreServices - -, useWayland ? false }: let @@ -82,7 +80,8 @@ mkYarnPackage rec { # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; # Do not attempt generating a tarball for element-web again. 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 05a8b99695..3c56d84db4 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 @@ -87,7 +87,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin abbradar ]; downloadPage = "http://gajim.org/downloads.php"; - updateWalker = true; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2ca94953c4..3acd11a9a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; - updateWalker = true; downloadPage = "http://mcabber.com/files/"; - downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 4e1d330f50..f16c7b599e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -7,13 +7,13 @@ , makeDesktopItem , copyDesktopItems , fetchYarnDeps -, yarn, nodejs, fixup_yarn_lock +, yarn +, nodejs +, fixup_yarn_lock , electron , Security , AppKit , CoreServices - -, useWayland ? false }: let @@ -88,7 +88,8 @@ stdenv.mkDerivation rec { # executable wrapper makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall ''; @@ -101,17 +102,17 @@ stdenv.mkDerivation rec { # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ (makeDesktopItem { - name = "schildichat-desktop"; - exec = "${executableName} %u"; - icon = "schildichat"; - desktopName = "SchildiChat"; - genericName = "Matrix Client"; - comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=schildichat - MimeType=x-scheme-handler/element; - ''; + name = "schildichat-desktop"; + exec = "${executableName} %u"; + icon = "schildichat"; + desktopName = "SchildiChat"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass=schildichat + MimeType=x-scheme-handler/element; + ''; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f1bcd10127..7489e765ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.27.1"; # Please backport all updates to the stable channel. + version = "5.29.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0z0v7q0rpxdx7ic78jv7wp1hq8nrfp51jjdr6d85x0hsfdj0z1mc"; + sha256 = "1a56mnmv0lnizmd4dl8fya3mdsy0jy5qr5bqb72m9cipq0069alc"; }; nativeBuildInputs = [ @@ -123,6 +123,7 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ) # Fix the desktop link diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 5e01755187..2ba8fcf579 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -84,7 +84,7 @@ let homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; linux = stdenv.mkDerivation rec { @@ -170,7 +170,8 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${lib.makeBinPath [xdg-utils]} + --prefix PATH : ${lib.makeBinPath [xdg-utils]} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 752fa7ba19..a339808745 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.9.1.1380"; + version = "5.9.3.1911"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0r1w13y3ks377hdyil9s68vn09vh22zl6ni4693fm7cf6q49ayyw"; + sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index fd08817f02..c196f6bdbd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -2,6 +2,7 @@ , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, makeWrapper }: let deps = [ @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + makeWrapper ]; buildInputs = deps; @@ -73,12 +75,14 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop - ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report + wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix index 8fe3dc9000..1d2aaca936 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyhackrf/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.3"; + version = "0.3.4"; in stdenv.mkDerivation { pname = "soapyhackrf"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyHackRF"; rev = "soapy-hackrf-${version}"; - sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; + sha256 = "sha256-fzPYHJAPX8FkFxPXpLlUagTd/NoamRX0YnxHwkbV1nI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index 5427f42a75..0f04100242 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -73,6 +73,11 @@ stdenv.mkDerivation rec { for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do rm -rf $comp/x86* done + + substituteInPlace lib/Tools/env \ + --replace /usr/bin/env ${coreutils}/bin/env + + rm -r heaps '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do @@ -83,6 +88,11 @@ stdenv.mkDerivation rec { done ''); + buildPhase = '' + export HOME=$TMP # The build fails if home is not set + bin/isabelle build -v -o system_heaps -b HOL + ''; + installPhase = '' mkdir -p $out/bin mv $TMP/$dirname $out @@ -117,7 +127,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://isabelle.in.tum.de/"; license = licenses.bsd3; - maintainers = [ maintainers.jwiegley ]; + maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.upstream b/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.upstream deleted file mode 100644 index 52b8ed1cda..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/logic/leo2/default.upstream +++ /dev/null @@ -1,6 +0,0 @@ -url http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html -version_link '[.]tgz' -version '.*_v([0-9.]+)[.][a-z0-9]+$' '\1' -do_overwrite () { - do_overwrite_just_version -} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.upstream b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.upstream deleted file mode 100644 index 062577d145..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.upstream +++ /dev/null @@ -1,6 +0,0 @@ -target clingo.nix -attribute_name clingo -url https://github.com/potassco/clingo/releases/ -ensure_choice -version '.*/v([0-9.]+)[.]tar[.].*' '\1' -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index 9bfad1fa01..7a523bbf24 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix @@ -66,6 +66,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 3cb018b9a5..b715c2fc33 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -6,7 +6,7 @@ # build , cmake , ctags -, python2Packages +, python3Packages , swig # math , eigen @@ -30,13 +30,13 @@ , lp_solve , colpack # extra support -, pythonSupport ? true +, pythonSupport ? false , opencvSupport ? false , opencv ? null , withSvmLight ? false }: -assert pythonSupport -> python2Packages != null; +assert pythonSupport -> python3Packages != null; assert opencvSupport -> opencv != null; assert (!blas.isILP64) && (!lapack.isILP64); @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; nativeBuildInputs = [ cmake swig ctags ] - ++ (with python2Packages; [ python jinja2 ply ]); + ++ (with python3Packages; [ python jinja2 ply ]); buildInputs = [ eigen @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nlopt lp_solve colpack - ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ]) + ] ++ lib.optionals pythonSupport (with python3Packages; [ python numpy ]) ++ lib.optional opencvSupport opencv; cmakeFlags = let @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" "-DTRAVIS_DISABLE_META_CPP=ON" - "-DPythonModular=${enableIf pythonSupport}" + "-DINTERFACE_PYTHON=${enableIf pythonSupport}" "-DOpenCV=${enableIf opencvSupport}" "-DUSE_SVMLIGHT=${enableIf withSvmLight}" ]; @@ -177,6 +177,12 @@ stdenv.mkDerivation rec { rm -r $out/share ''; + postFixup = '' + # CMake incorrectly calculates library path from dev prefix + substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/" + ''; + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix index 4ba1d5c6b4..a9c002d210 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix @@ -82,6 +82,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index ec5d9ef366..dd8258a345 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.upstream b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.upstream deleted file mode 100644 index e8ce81586a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url https://sourceforge.net/projects/golly/files/golly/ -version_link '[-][0-9.]+/$' -SF_version_tarball 'src' -SF_redirect -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 9962b1ce60..f8037c01e0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -176,7 +175,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH : "$out/lib" + --set PYTHONPATH "$out/lib" \ + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" done ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix index 1dfd47a3d3..87a05f146e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 -, cmake, makeWrapper, libjpeg, python2 }: +{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew +, qtbase, wrapQtAppsHook, python3 +, cmake, libjpeg }: -let version = "5.2.1"; in stdenv.mkDerivation rec { pname = "tulip"; - inherit version; + version = "5.6.1"; src = fetchurl { url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; - sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; + sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw"; }; - buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ]; + buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; - nativeBuildInputs = [ cmake makeWrapper ]; + qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index 48c4f6f2c4..4920372411 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "arakiken"; repo = pname; - rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1 + rev = version; sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro="; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index fddffe6d19..b8befad558 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -11,17 +11,24 @@ , pyyaml , argcomplete , typing-extensions +, packaging +, pytestCheckHook +, pytest-freezegun +, pytest-mock +, pytest-regressions +, git }: buildPythonApplication rec { pname = "commitizen"; - version = "2.20.3"; + version = "2.20.4"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAm2GTRxZIHQmn/FM0IwwH/2h+oOvzGmeVr5xkvD/zA="; + sha256 = "sha256-2DhWiUAkAkyNxYB1CGzUB2nGZeCWvFqSztrxasUPSXw="; + deepClone = true; }; format = "pyproject"; @@ -38,6 +45,59 @@ buildPythonApplication rec { pyyaml argcomplete typing-extensions + packaging + ]; + + doCheck = true; + checkInputs = [ + pytestCheckHook + pytest-freezegun + pytest-mock + pytest-regressions + argcomplete + git + ]; + + # NB: These require full git history + disabledTests = [ + "test_breaking_change_content_v1" + "test_breaking_change_content_v1_beta" + "test_breaking_change_content_v1_multiline" + "test_bump_command_prelease" + "test_bump_dry_run" + "test_bump_files_only" + "test_bump_local_version" + "test_bump_major_increment" + "test_bump_minor_increment" + "test_bump_on_git_with_hooks_no_verify_disabled" + "test_bump_on_git_with_hooks_no_verify_enabled" + "test_bump_patch_increment" + "test_bump_tag_exists_raises_exception" + "test_bump_when_bumpping_is_not_support" + "test_bump_when_version_inconsistent_in_version_files" + "test_bump_with_changelog_arg" + "test_bump_with_changelog_config" + "test_bump_with_changelog_to_stdout_arg" + "test_changelog_config_flag_increment" + "test_changelog_config_start_rev_option" + "test_changelog_from_start" + "test_changelog_from_version_zero_point_two" + "test_changelog_hook" + "test_changelog_incremental_angular_sample" + "test_changelog_incremental_keep_a_changelog_sample" + "test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag" + "test_changelog_incremental_with_release_candidate_version" + "test_changelog_is_persisted_using_incremental" + "test_changelog_multiple_incremental_do_not_add_new_lines" + "test_changelog_replacing_unreleased_using_incremental" + "test_changelog_with_different_cz" + "test_get_commits" + "test_get_commits_author_and_email" + "test_get_commits_with_signature" + "test_get_latest_tag_name" + "test_is_staging_clean_when_updating_file" + "test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero" + "test_prevent_prerelease_when_no_increment_detected" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 85993487fb..405b939455 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -92,7 +92,6 @@ let downloadPage = "https://www.mercurial-scm.org/release/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lukegb pacien ]; - updateWalker = true; platforms = platforms.unix; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.upstream b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.upstream deleted file mode 100644 index e0d01fb190..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://www.monotone.ca/downloads.php - -do_overwrite(){ - ensure_version - ensure_hash - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} diff --git a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix index cf5608e66a..0f7438e392 100644 --- a/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/lbry/default.nix @@ -2,7 +2,7 @@ let pname = "lbry-desktop"; - version = "0.50.2"; + version = "0.52.0"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; + sha512 = "FMsO1tUhym11hxot/0S4pXwjvt1YhOUahwiQU+HhOxrZhcrOwwyXUzMy3sAzKdZjidKpA5DbLjkgwPlg2kGWwg=="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index 8a2522397a..957911e239 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.1.0"; + version = "3.1.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-T2M0vg+BYIdr21CcdrrBf7bVVlZU+tKJWG2xfBMoMlg="; + sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ="; }; checkInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 1efebb6fdf..7aa780f8a7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms xlibsWrapper ]) - ++ optional (!hostIsAarch) live555 + ++ optional (!hostIsAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] ++ optionals skins2Support (with xorg; [ @@ -192,6 +192,16 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch"; sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ="; }) + # patches to build with recent live555 + # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 + (fetchpatch { + url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch"; + sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd"; + }) + (fetchpatch { + url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; + sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 2164f16bd3..4a2ec178be 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-j2+ga+jnKnjnFGmrOOym99keLALg7wR7Jk+jjesiMc4="; + sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix index 8299304045..0a2febd058 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix @@ -254,5 +254,9 @@ stdenv.mkDerivation (rec { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; license = lib.licenses.gpl2; + # https://xenbits.xen.org/docs/unstable/support-matrix.html + knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [ + "This version of Xen has reached its end of life. See https://xenbits.xen.org/docs/unstable/support-matrix.html" + ]; } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/references.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/references.nix index a2bee51b13..989722121c 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/references.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/references.nix @@ -28,7 +28,7 @@ nixosTest { virtualisation.writableStore = true; # Test runs without network, so we don't substitute and prepare our deps - nix.binaryCaches = lib.mkForce []; + nix.settings.substituters = lib.mkForce []; environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( builtins.toJSON [hello figlet stdenvNoCC] ); diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/third_party/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix deleted file mode 100644 index 006537278d..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ /dev/null @@ -1,19 +0,0 @@ -a : -a.stdenv.mkDerivation { - buildCommand = '' - mkdir -p "$out/attributes" - '' + (a.lib.concatStrings (map - (n: '' - ln -s "${a.writeTextFile {name=n; text=builtins.getAttr n a.theAttrSet;}}" $out/attributes/${n}; - '') - (builtins.attrNames a.theAttrSet) - )); - - name = "attribute-set"; - meta = { - description = "Contents of an attribute set"; - maintainers = [ - a.lib.maintainers.raskin - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info-git.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info-git.sh deleted file mode 100755 index 6687a1f8f4..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info-git.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh - -[ -z "$1" ] && { - echo "Use $0 expression-basename repo-url branch-name package-base-name" - echo "Like:" - echo "$0 default http://git.example.com/repo origin/master hello" - exit 1; -} >&2 - -own_dir="$(cd "$(dirname "$0")"; sh -c pwd)" - -cp "$own_dir/../builder-defs/template-bdp-uud.nix" "$1.nix" -sed -e "s@src-for-default.nix@src-for-$1.nix@g; - s@fetchUrlFromSrcInfo@fetchGitFromSrcInfo@g" -i "$1.nix" -echo '{}' > "src-for-$1.nix" -cat << EOF > src-info-for-$1.nix -{ - repoUrl = "$2"; - rev = "$3"; - baseName = "$4"; - method = "fetchgit"; -} -EOF - diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info.sh deleted file mode 100755 index fbbbe33a9e..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/create-src-info.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh - -[ -z "$1" ] && { - echo "Use $0 expression-basename download-page package-base-name" - echo "Like:" - echo "$0 default http://example.com/downloads hello" - exit 1; -} >&2 - -own_dir="$(cd "$(dirname "$0")"; sh -c pwd)" - -cp "$own_dir/../builder-defs/template-auto-callable.nix" "$1.nix" -sed -e "s@src-for-default.nix@src-for-$1.nix@g" -i "$1.nix" -echo '{}' > "src-for-$1.nix" -cat << EOF > src-info-for-$1.nix -{ - downloadPage = "$2"; - baseName = "$3"; -} -EOF diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/design.txt b/third_party/nixpkgs/pkgs/build-support/upstream-updater/design.txt deleted file mode 100644 index 128be89d20..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/design.txt +++ /dev/null @@ -1,29 +0,0 @@ -Next to file.nix we get src-for-file.nix -src-for-file.nix should evaluate to a flat attribute set with -string values. -It is supposed to be imported in the main expression. -In the ideal world it can export url, hash, version. - -src-for-file.nix generation is directed by -src-info-for-file.nix. - -Attributes: - -src-info-for-file.nix: - -downloadPage -rev (for repos) -baseName (default = unnamed-package) -sourceRegexp (default = '.*[.]tar[.].*') -choiceCommand (default = 'head -1') -versionExtractorSedScript (default = 's/.*-([0-9.]+)[.].*/\1/') -versionReferenceCreator (default = 's/-([0-9.]+)[.]/-${version}./') -mirrorSedScript (default = none) - -src-for-file.nix: - -advertisedUrl (its match is the check for update presence) -url -hash -version -name diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/snippets.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/snippets.sh deleted file mode 100644 index 2c06696c92..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/snippets.sh +++ /dev/null @@ -1,14 +0,0 @@ -# sed scripts - -#http://sourceforge.net/projects/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz/download -#http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz -skipRedirectSF='s@sourceforge.net/projects@downloads.sourceforge.net/project@; s@/files@@; s@/download$@@;' -extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@' -extractVersionSF='s@.*/[^/0-9]*([0-9].*)[.](tar|tgz|tbz2|zip).*@\1@' -apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@' -skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@' - -replaceAllVersionOccurences() { - echo s/"$version"/\${version}/g -} -dashDelimitedVersion='s/.*-([0-9.]+)-.*/\1/' diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/test-case.nix b/third_party/nixpkgs/pkgs/build-support/upstream-updater/test-case.nix deleted file mode 100644 index 498f15c28a..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/test-case.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - a=1; - b="text"; - c='' - text - ''; - d='' - Multi-line text with special characters - - like \ (backslash) and ''${} (dollar + - curly braces) and $ (dollar) and ' (quote) - and " (double quote). - ''; -} diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-upstream-data.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-upstream-data.sh deleted file mode 100755 index 38c0d13a72..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-upstream-data.sh +++ /dev/null @@ -1,182 +0,0 @@ -#! /bin/sh - -set -x - -own_dir="$(cd "$(dirname "$0")"; sh -c pwd)" - -source "$own_dir/snippets.sh" - -[ -z "$1" ] && { - echo "Specify main expression filename." - exit 1; -} - -main_file="$1" -main_dir="$(cd "$(dirname "$main_file")" ; sh -c pwd)" -file_name="$(basename "$main_file")" -defs_file="$main_dir"/src-info-for-"$file_name" -src_file="$main_dir"/src-for-"$file_name" -# OK, [vcs] revert is always possible -new_src_file="$main_dir"/src-for-"$file_name" - -forcedUrl="$2" - -defs_dir="$("$own_dir"/attrset-to-dir.sh "$defs_file")" -src_defs_dir="$("$own_dir"/attrset-to-dir.sh "$src_file")" - -getAttr () { - file="$defs_dir"/"$1" - data="$( ( [ -f "$file" ] && cat "$file" ) || echo "$2" )" - echo "attribute $1 obtained as: [[$data]]" >&2 - echo "$data" -} - -method="$(getAttr method fetchurl)" -baseName="$(getAttr baseName 'unnamed-package')" -commonPrefetchVars=" version name hash" - -prefetchClause="" -[ fetchSFdirs = "$method" ] && { - if [ -z "$forcedUrl" ]; then - freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | - eval "egrep '$(getAttr sourceRegexp '[-][0-9.]+/$')'" | - eval "egrep -v '$(getAttr blacklistRegexp '^$')'" | - eval "$(getAttr choiceCommand 'head -n 1')" | - eval "$(getAttr versionToFileCommand "sed -re 's@/([^/]*-[0-9.]+)/@/\1/\1$(getAttr fileSuffix .tar.gz)@'")" - )" - - if ! egrep ':' <<< "$freshUrl" ; then - freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl" - fi - - echo "Found download link: $freshUrl" >&2 - else - freshUrl="$forcedUrl" - fi - - freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")" - echo "Sourceforge-corrected URL: $freshUrl" >&2 - - version="$(echo "$freshUrl" | - sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")" - baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")" - url="$freshUrl" - name="$baseName-$version" - advertisedUrl="$freshUrl" - - if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then - echo "Source link not changed" >&2 - exit - fi - hash=$(nix-prefetch-url "$freshUrl") - - prefetchVars="url advertisedUrl"; -} -[ fetchSF = "$method" ] && { - if [ -z "$forcedUrl" ]; then - freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | - eval "egrep \"$(getAttr sourceRegexp '.*[.]tar[.].*|.*[.]tgz$|.*[.]tbz2$')\"" | - eval "egrep -v \"$(getAttr blacklistRegexp '^$')\"" | - eval "$(getAttr choiceCommand 'head -1')")" - - if ! egrep ':' <<< "$freshUrl" ; then - freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl" - fi - - echo "Found download link: $freshUrl" >&2 - else - freshUrl="$forcedUrl" - fi - - freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")" - echo "Sourceforge-corrected URL: $freshUrl" >&2 - - version="$(echo "$freshUrl" | - sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")" - baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")" - url="$freshUrl" - name="$baseName-$version" - advertisedUrl="$freshUrl" - - if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then - echo "Source link not changed" >&2 - exit - fi - hash=$(nix-prefetch-url "$freshUrl") - - prefetchVars="url advertisedUrl"; -} -[ fetchurl = "$method" ] && { - if [ -z "$forcedUrl" ] ; then - freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | - eval "egrep \"$(getAttr sourceRegexp '.*[.]tar[.].*|.*[.]tgz$|.*[.]tbz2$')\"" | - eval "egrep -v \"$(getAttr blacklistRegexp '^$')\"" | - eval "$(getAttr choiceCommand 'head -1')")" - - if ! egrep ':' <<< "$freshUrl" ; then - freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl" - fi - - echo "Found download link: $freshUrl" >&2 - else - freshUrl="$forcedUrl" - fi - - version="$(echo "$freshUrl" | - eval "sed -re \"$(getAttr versionExtractorSedScript \ - 's/.*-([0-9.]+)[.].*/\1/')\"")" - - mirrorUrl="$(echo "$freshUrl" | - eval "sed -r -e \"$(getAttr versionReferenceCreator \ - 's/-'"${version}"'[.]/-\${version}./')\"" | - eval "sed -r -e \"$(getAttr mirrorSedScript)\"")" - url="$mirrorUrl" - - name="$baseName-$version" - - advertisedUrl="$freshUrl" - url="$mirrorUrl" - - if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then - echo "Source link not changed" >&2 - exit - fi - hash=$(nix-prefetch-url "$freshUrl") - - prefetchVars="url advertisedUrl"; -} -[ "fetchgit" = "$method" ] && { - repoUrl="$(getAttr repoUrl)" - export NIX_PREFETCH_GIT_CHECKOUT_HOOK=" - cat .git/HEAD - " - export NIX_HASH_ALGO=sha256 - rev="$(getAttr rev '')"; - rev_and_hash="$("$own_dir"/../fetchgit/nix-prefetch-git "$repoUrl" "$rev" | tee /dev/stderr | tail -2)" - - rev="$(echo "$rev_and_hash" | head -1)" - url="$repoUrl"; - hash="$(echo "$rev_and_hash" | tail -1)" - version="$rev" - name="$baseName-$version" - - prefetchVars="rev url"; -} - -prefetchAssignments=""; -for i in $commonPrefetchVars $prefetchVars; do - prefetchAssignments="$prefetchAssignments $i=\"$(eval echo \"\$$i\")\";$(echo -e '\n ')" -done; - -extraAssignments="" -for i in $(getAttr extraVars ''); do - eval "$(getAttr "eval_$i" 'i=""')" - extraAssignments="$extraAssignments $i=\"$(eval echo \"\$$i\")\";$(echo -e '\n ')" -done - -cat << EOF > "$new_src_file" -rec { - $prefetchAssignments - $extraAssignments -} -EOF diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker-service-specific.sh deleted file mode 100644 index d92d223845..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker-service-specific.sh +++ /dev/null @@ -1,20 +0,0 @@ -SF_redirect () { - redirect 99 - process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' - process '[?].*' '' -} - -SF_version_dir () { - version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$' -} - -SF_version_tarball () { - version_link "${1:-[.]tar[.]}.*/download\$" -} - -GH_latest () { - prefetch_command_rel ../fetchgit/nix-prefetch-git - revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )" - version '.*' "git-$(date +%Y-%m-%d)" - NEED_TO_CHOOSE_URL= -} diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh b/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh deleted file mode 100755 index 9172a41718..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.sh +++ /dev/null @@ -1,320 +0,0 @@ -#! /bin/sh - -own_dir="$(cd "$(dirname "$0")"; pwd)" - -URL_WAS_SET= -DL_URL_RE= -CURRENT_URL= -CURRENT_REV= -PREFETCH_COMMAND= -NEED_TO_CHOOSE_URL=1 - -url () { - URL_WAS_SET=1 - CURRENT_URL="$1" -} - -dl_url_re () { - DL_URL_RE="$1" -} - -version_unpack () { - sed -re ' - s/[.]/ /g; - s@/@ / @g - s/-(rc|pre)/ -1 \1 /g; - s/-(gamma)/ -2 \1 /g; - s/-(beta)/ -3 \1 /g; - s/-(alpha)/ -4 \1 /g; - s/[-]/ - /g; - ' -} - -version_repack () { - sed -re ' - s/ - /-/g; - s/ -[0-9]+ ([a-z]+) /-\1/g; - s@ / @/@g - s/ /./g; - ' -} - -version_sort () { - version_unpack | - sort -t ' ' -n $(for i in $(seq 30); do echo " -k${i}n" ; done) | tac | - version_repack -} - -position_choice () { - head -n "${1:-1}" | tail -n "${2:-1}" -} - -matching_links () { - "$own_dir"/urls-from-page.sh "$CURRENT_URL" | grep -E "$1" -} - -link () { - CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" - unset NEED_TO_CHOOSE_URL - echo "Linked by: $*" - echo "URL: $CURRENT_URL" >&2 -} - -version_link () { - CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" - unset NEED_TO_CHOOSE_URL - echo "Linked version by: $*" - echo "URL: $CURRENT_URL" >&2 -} - -redirect () { - CURRENT_URL="$(curl -I -L --max-redirs "${1:-99}" "$CURRENT_URL" | - grep -E '^[Ll]ocation: ' | position_choice "${2:-999999}" "$3" | - sed -e 's/^[Ll]ocation: //; s/\r//')" - echo "Redirected: $*" - echo "URL: $CURRENT_URL" >&2 -} - -replace () { - sed -re "s $1 $2 g" -} - -process () { - CURRENT_URL="$(echo "$CURRENT_URL" | replace "$1" "$2")" - echo "Processed: $*" - echo "URL: $CURRENT_URL" >&2 -} - -version () { - CURRENT_VERSION="$(echo "$CURRENT_URL" | replace "$1" "$2")" - echo "Version: $CURRENT_VERSION" >&2 -} - -ensure_version () { - echo "Ensuring version. CURRENT_VERSION: $CURRENT_VERSION" >&2 - [ -z "$CURRENT_VERSION" ] && version '.*-([0-9.]+)[-._].*' '\1' -} - -ensure_target () { - echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2 - [ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix" -} - -ensure_name () { - echo "Ensuring name. CURRENT_NAME: $CURRENT_NAME" >&2 - [ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")" - echo "Resulting name: $CURRENT_NAME" -} - -ensure_attribute_name () { - echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2 - ensure_name - [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME" - echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME" -} - -ensure_url () { - echo "Ensuring starting URL. CURRENT_URL: $CURRENT_URL" >&2 - ensure_attribute_name - [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadPage)" - [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadpage)" - [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta homepage)" - echo "Resulting URL: $CURRENT_URL" -} - -ensure_choice () { - echo "Ensuring that choice is made." >&2 - echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2 - echo "CURRENT_URL: $CURRENT_URL" >&2 - [ -z "$URL_WAS_SET" ] && [ -z "$CURRENT_URL" ] && ensure_url - [ -n "$NEED_TO_CHOOSE_URL" ] && { - version_link "${DL_URL_RE:-[.]tar[.]([^./])+\$}" - unset NEED_TO_CHOOSE_URL - } - [ -z "$CURRENT_URL" ] && { - echo "Error: empty CURRENT_URL" - echo "Error: empty CURRENT_URL" >&2 - exit 1 - } -} - -revision () { - CURRENT_REV="$1" - echo "CURRENT_REV: $CURRENT_REV" -} - -prefetch_command () { - PREFETCH_COMMAND="$1" -} - -prefetch_command_rel () { - PREFETCH_COMMAND="$(dirname "$0")/$1" -} - -ensure_hash () { - echo "Ensuring hash. CURRENT_HASH: $CURRENT_HASH" >&2 - [ -z "$CURRENT_HASH" ] && hash -} - -hash () { - CURRENT_HASH="$(${PREFETCH_COMMAND:-nix-prefetch-url} "$CURRENT_URL" $CURRENT_REV)" - echo "CURRENT_HASH: $CURRENT_HASH" >&2 -} - -name () { - CURRENT_NAME="$1" - echo "CURRENT_NAME: $CURRENT_NAME" >&2 -} - -attribute_name () { - CURRENT_ATTRIBUTE_NAME="$1" - echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2 -} - -retrieve_meta () { - nix-instantiate --eval-only '' -A "$CURRENT_ATTRIBUTE_NAME".meta."$1" | xargs -} - -retrieve_version () { - PACKAGED_VERSION="$(retrieve_meta version)" -} - -ensure_dl_url_re () { - echo "Ensuring DL_URL_RE. DL_URL_RE: $DL_URL_RE" >&2 - [ -z "$DL_URL_RE" ] && dl_url_re "$(retrieve_meta downloadURLRegexp)" - echo "DL_URL_RE: $DL_URL_RE" >&2 -} - -directory_of () { - cd "$(dirname "$1")"; pwd -} - -full_path () { - echo "$(directory_of "$1")/$(basename "$1")" -} - -target () { - CURRENT_TARGET="$1" - { [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; } - echo "Target set to: $CURRENT_TARGET" -} - -marker () { - BEGIN_EXPRESSION="$1" -} - -update_found () { - echo "Compare: $CURRENT_VERSION vs $PACKAGED_VERSION" - [ "$CURRENT_VERSION" != "$PACKAGED_VERSION" ] -} - -do_write_expression () { - echo "${1}rec {" - echo "${1} baseName=\"$CURRENT_NAME\";" - echo "${1} version=\"$CURRENT_VERSION\";" - echo "${1} name=\"\${baseName}-\${version}\";" - echo "${1} hash=\"$CURRENT_HASH\";" - echo "${1} url=\"$CURRENT_URL\";" - [ -n "$CURRENT_REV" ] && echo "${1} rev=\"$CURRENT_REV\";" - echo "${1} sha256=\"$CURRENT_HASH\";" - echo "$2" -} - -line_position () { - file="$1" - regexp="$2" - count="${3:-1}" - grep -E "$regexp" -m "$count" -B 999999 "$file" | wc -l -} - -replace_once () { - file="$1" - regexp="$2" - replacement="$3" - instance="${4:-1}" - - echo "Replacing once:" - echo "file: [[$file]]" - echo "regexp: [[$regexp]]" - echo "replacement: [[$replacement]]" - echo "instance: [[$instance]]" - - position="$(line_position "$file" "$regexp" "$instance")" - sed -re "${position}s $regexp $replacement " -i "$file" -} - -set_var_value () { - var="${1}" - value="${2}" - instance="${3:-1}" - file="${4:-$CURRENT_TARGET}" - no_quotes="${5:-0}" - - quote='"' - let "$no_quotes" && quote="" - - replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};" "$instance" -} - -do_regenerate () { - BEFORE="$(cat "$1" | grep -F "$BEGIN_EXPRESSION" -B 999999;)" - AFTER_EXPANDED="$(cat "$1" | grep -F "$BEGIN_EXPRESSION" -A 999999 | grep -E '^ *[}] *; *$' -A 999999;)" - AFTER="$(echo "$AFTER_EXPANDED" | tail -n +2)" - CLOSE_BRACE="$(echo "$AFTER_EXPANDED" | head -n 1)" - SPACING="$(echo "$CLOSE_BRACE" | sed -re 's/[^ ].*//')" - - echo "$BEFORE" - do_write_expression "$SPACING" "$CLOSE_BRACE" - echo "$AFTER" -} - -do_overwrite () { - ensure_hash - do_regenerate "$1" > "$1.new.tmp" - mv "$1.new.tmp" "$1" -} - -do_overwrite_just_version () { - ensure_hash - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} - -minimize_overwrite() { - do_overwrite(){ - do_overwrite_just_version - } -} - -process_config () { - CONFIG_DIR="$(directory_of "$1")" - CONFIG_NAME="$(basename "$1")" - BEGIN_EXPRESSION='# Generated upstream information'; - if [ -f "$CONFIG_DIR/$CONFIG_NAME" ] && - [ "${CONFIG_NAME}" = "${CONFIG_NAME%.nix}" ]; then - source "$CONFIG_DIR/$CONFIG_NAME" - else - CONFIG_NAME="${CONFIG_NAME%.nix}" - ensure_attribute_name - [ -n "$(retrieve_meta updateWalker)" ] || - [ -n "$FORCE_UPDATE_WALKER" ] || { - echo "Error: package not marked as safe for update-walker" >&2 - echo "Set FORCE_UPDATE_WALKER=1 to override" >&2 - exit 1; - } - [ -z "$(retrieve_meta fullRegenerate)" ] && eval " - minimize_overwrite - " - fi - ensure_attribute_name - retrieve_version - ensure_dl_url_re - ensure_choice - ensure_version - ensure_target - update_found && do_overwrite "$CURRENT_TARGET" -} - -source "$own_dir/update-walker-service-specific.sh" - -process_config "$1" diff --git a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.txt b/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.txt deleted file mode 100644 index ae47e55902..0000000000 --- a/third_party/nixpkgs/pkgs/build-support/upstream-updater/update-walker.txt +++ /dev/null @@ -1,118 +0,0 @@ -update-walker is an imperative semiautomated update helper. - -It runs the X.upstream file to find the freshest version of the package in -the specified upstream source and updates the corresponding X.nix file. - - - -The simplest available commands: - -url: set the upstream source list URL equal to $1; the default is -meta.downloadPage with meta.homepage fallback - -dl_url_re: set the regular expression used to select download links to $1; the -default is meta.downloadURLRegexp or '[.]tar[.]([^./])+\$' if it is not set - -target: specify target expression; default is to replace .upstream extension -with .nix extension - -name: specify the derivation name; default is the basename of the dirname -of the .upstream file - -attribute_name: specify the attribute name to evaluate for getting the current -version from meta.version; default is to use the derivation name - -minimize_overwrite: set config options that mean that only version= and -sha256= have to be replaced; the default is to regenerate a full upstream -description block with url, name, version, hash etc. - - - -A lot of packages can be updated in a pseudo-declarative style using only -the commands from the previous paragraph. - -Some packages do not need any non-default settings, in these case just setting -meta.updateWalker to true is enough, you can run update-walker directly on the -.nix file afterwards. In this case minimize_overwrite it implied unless -meta.fullRegenerate is set. - - - -The packages that require more fine-grained control than the described options -allow, you need to take into account the default control flow of the tool. - -First, the definitions from update-walker script and additional definitions -from update-walker-service-specific.sh are loaded. Then the config is executed -as a shell script. Some of the commands it can use do remember whether they -have been used. Afterwards the following steps happen: - -attribute_name is set to name unless it has been already set - -meta.version is read from the NixPkgs package called attribute_name - -download URL regexp is set to default unless it has been already set in the -updater script - -the download page URL gets set to default value unless it has been set -previously - -if the action of getting the download page and choosing the freshest link by -version has not yet been taken, it happens - -if the version has not yet been extracted from the URL, it gets extracted - -target nix expression to update gets set to the default value unless it has -been set explicitly - -if the URL version is fresher than the packaged version, the new file gets -downloaded and its hash is calculated - -do_overwrite function is called; the default calculates a big upstream data -block and puts it after the '# Generated upstream information' marker (the -marker can be changed by the command marker) - - - -If the update needs some special logic, it is put into the updater script and -the corresponding steps are skipped because the needed action has already been -performed. - -For example: - -minimize_overwrite is exactly the same as - -do_overwrite() { do_overwrite_just_version; } - -redefinition. You can do a more complex do_overwrite redifinition, if needed. -It can probably use ensure_hash to download the source and calculate the hash -and set_var_value. - -set_var_value alters the $3-th instance of assigning the $1 name in the -expression to the value $2. $3 defaults to 1. It can modify $4 instead of the -current target, it can put the value without quotes if $5 is 1. - - - -Typical steps include: - -ensure_choice: download current URL and find the freshest version link on the -page, it is now the new URL - -ensure_hash: download current URL and calculate the source package hash - -ensure_version: extract version from the URL - -SF_redirect: replace the current URL with a SourceForge.net mirror:// URL - -SF_version_dir: assume SourceForge.net layout and choose the freshest -version-named subdirectory in the file catalog; you can optionally specify $1 -as a directory name regexp (digits and periods will be required after it) - -SF_version_tarball: assume SourceForge.net layout and choose the freshest -tarball download link - -version: apply replacement of $1 with $2 (extended regexp format) to extract -the version from URL - -version_link: choose the freshest versioned link, $1 is the regexp of -acceptable links diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 6b2c5fc925..c695ea2688 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": "6f406277d7106375f7148466c985061d20cb028b", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6f406277d7106375f7148466c985061d20cb028b.tar.gz", - "sha256": "0jvxybgv975lmk268x12dlp8xxv12vmpwc00k3nv6qqp0xd9bwla", - "msg": "Update from Hackage at 2022-01-18T22:54:05Z" + "commit": "3034b8f1052c41d5b3c571cb2bedb5f62bbede65", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3034b8f1052c41d5b3c571cb2bedb5f62bbede65.tar.gz", + "sha256": "0kqga1mf7vr292jcaqw8qk4s1bjwc2z1wwjih5xwli3hkk584l20", + "msg": "Update from Hackage at 2022-01-24T10:21:35Z" } diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4b829321c3..5f1d0e9e71 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.1"; + version = "6.1.2"; outputs = [ "out" "dev" ]; @@ -41,18 +40,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY="; + sha256 = "sha256-g9g4wJXjjudk4Qt96XGUiV/X86Ae2lqhM+psh9h+XFE="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/files/pull/1973 - (fetchpatch { - url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch"; - sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 64a3083c6c..fbad5aa7a0 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4"; + sha256 = "sha256-CdSX4p98HQNC0VF5Ae/ZnDqm000+9KJ6JhQWhSHC4CI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 588061b22e..24ce7b5ad5 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -20,24 +19,15 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI="; + sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/capnet-assist/pull/76 - (fetchpatch { - url = "https://github.com/elementary/capnet-assist/commit/0e77bf8023ba1b35e3a5badb72c246cabf6552b9.patch"; - sha256 = "sha256-B/KEs/TCxR+i3uQSRtWxTi2+cu0n6QLcfKCbMCvSsvs="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 3ceff2095d..614be5603a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-8gBMjCMEzrFmKHhkXsgcIESC93EOT0ADkRUIJMmerjw="; + sha256 = "sha256-YICNOeNrpO2tJFyULjQEhZQCrrMyQau59EC7c5K9q40="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.upstream b/third_party/nixpkgs/pkgs/development/compilers/fpc/default.upstream deleted file mode 100644 index 9f16c1b645..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.upstream +++ /dev/null @@ -1,6 +0,0 @@ -url https://sourceforge.net/projects/freepascal/files/Source/ -SF_version_dir -version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$' -SF_redirect -version '.*-([0-9.]+)[.]tar[.]gz' '\1' -do_overwrite () { do_overwrite_just_version; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix index 9ce6a98e1c..f53e9a0389 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -9,7 +9,7 @@ in inherit mkGraal; graalvm11-ce = mkGraal rec { - version = "21.3.0"; + version = "22.0.0.2"; javaVersion = "11"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; @@ -20,7 +20,7 @@ in # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn # helper: pid: 19865, exit value: 1" graalvm17-ce = mkGraal rec { - version = "21.3.0"; + version = "22.0.0.2"; javaVersion = "17"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix index 98f3b2703c..f21fdb2527 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -3,55 +3,55 @@ [ { sha256 = { - "11-linux-aarch64" = "0hsjxp6ly7jsn9k94fddcl7afc5gda66jyppcnfvslishbizqd0i"; - "17-linux-aarch64" = "09hzl80m7f5ppmcvryz9aq0yw9scdkp5dqhblrqnkzyhvdjl5ycn"; - "11-linux-amd64" = "1ylk5l933z813k0k1xlayiv8fa0f1gmpr66bma51532iy3mch6rs"; - "17-linux-amd64" = "1xn3shwkai61vvzsg595k8776a21ds00w2pjlscvfcbs1ag07n0i"; - "11-darwin-amd64" = "0qpqnnmqxvxzj3mwz05acpg4n8ffqsz0sji8lbl03fgswpvgfavc"; - "17-darwin-amd64" = "1akpsrd9r2igcls0cvhpqw3jrnh59m8z80knx83lmj0cj836a8v0"; + "11-linux-aarch64" = "0n1cgd9rn5aw7rzbd45nlzpnqif095zwl3999vddlhpnjlyjdh0w"; + "17-linux-aarch64" = "1iw27igiyzzl43yfgid1h6h7hd0xnv0rfdkp4r7r8i51sa3q7my7"; + "11-linux-amd64" = "00vipkrhc7d5xxznm07pjrdjahhfg5s5vxg49xz8qxz2nwxhi1mw"; + "17-linux-amd64" = "1m4v2s1b2878r6dqpcxvbqpc3s2l8l0xcbna37bbfx6rsc73wx2g"; + "11-darwin-amd64" = "08v37avg439hywx2yqx0bnfpazwaja2xhyc0kj1imib6iadib042"; + "17-darwin-amd64" = "16lg3qfx7j8w8cxc3abl7c19nj6jhkni99wmff153lyhyk8zjjnm"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java${javaVersionPlatform}-21.3.0.tar.gz"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java${javaVersionPlatform}-22.0.0.2.tar.gz"; } { sha256 = { - "11-linux-aarch64" = "0qlmg5fwvqsb5ab3irj2hrcd5jc94mibnlz1gvzpnq85rw1zcb6h"; - "17-linux-aarch64" = "0jmarhwngs6vpbcgsix0dxhj42qj9vnk3vln8fhdxmydwnns8r1m"; - "11-linux-amd64" = "0kvnjr55rizy53vn0ff9w27z1qh9d1vp3s7r1kdl0wyhrbhd8n49"; - "17-linux-amd64" = "0h14sml42jda54agjs1prfnyjaxxsc67350fr51n8p20nl28lj6z"; - "11-darwin-amd64" = "1mg8c8hh8wmbwsisgarmp35jd0dall1fwdv49mggp74hicbc32h3"; - "17-darwin-amd64" = "0qz0xf2ph9gi45vvri7vphxh35m11nk7sa8nkwxl28l8bza0kb40"; + "11-linux-aarch64" = "17h0yfw0lxsiblqv1nzpc6i71vh6hbwf1x6lp7kziass1a4ixm2i"; + "17-linux-aarch64" = "1nvm04smzbis1jy9znac2a4yf9ajqvvmadcf5ffr521rm784g2br"; + "11-linux-amd64" = "07g7fab0zj1h77a30kiswqm0hvr1m5s6crszcbyvha2v3x2a6145"; + "17-linux-amd64" = "0c8qi7b63zkjrz3sz01bbmfni7pcz9nq1jv1f34lj9lcsm8gc9cc"; + "11-darwin-amd64" = "0xn1frj1f4pzrd5gm6xwq31blgvz8l9249c97q3yh7p6rkk7vhh3"; + "17-darwin-amd64" = "1dr80314fxcklmhi19jn3pqrsz3iivbvcxnphdzl978krm1afzq0"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/native-image-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-aarch64" = "02rvwl1nng8d3qn226rjx5yq2blxs4yz009ab928qanhmb4vhv8b"; - "17-linux-aarch64" = "13kaxbgfp9pm6s28i5hfyg957iiwzrxf0ibibkv2yndgj64vj8xg"; - "11-linux-amd64" = "0zz62zr7imjaw9a3j5m66xs7c72cqb1i74ab3rnlh0dgs1mdpljg"; - "17-linux-amd64" = "1v2iwznlav8dsjj30nlhvsvv7pxmyzkhkp1p7spjjma09d34q4iv"; - "11-darwin-amd64" = "1wiv0299b2xrc229alczmjfj1bsn90p0wdm64rr39xnyyhbqrr80"; - "17-darwin-amd64" = "095sii8ibjcvvc6wnxk77ax151c4zgj8bpp81q3kyaazgpzvrk5s"; + "11-linux-aarch64" = "103d91sz2dmlc5hcbi9v3d3irgb83755hz16vkknfhbbkhm5iyz0"; + "17-linux-aarch64" = "0vas98knpvpajmv8bkgcf0fh7n5fy361nd47002cpppg6hrp7k9q"; + "11-linux-amd64" = "0h4s1dgx2wn63pabdckl85s70s1kw97vp0c8z7izihdn2fy7w3z9"; + "17-linux-amd64" = "1g98ashyvscwyn1k8mamih6qhcbxsk62x6ynd7x81ndy1karlv6q"; + "11-darwin-amd64" = "1y8d6c2ri7hrvsv3aqbcp49pmxh9yppcsfnx0jcwm88wlach0p52"; + "17-darwin-amd64" = "13a6rchnaczpmxga6g405z55913ayq5gwihzlvyy6shk6gwbcppw"; }.${javaVersionPlatform} or null; - url = "https://github.com/oracle/truffleruby/releases/download/vm-21.3.0/ruby-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-aarch64" = "1ck4c1z98h1zn4i6xhh1hb6w2jab6n17ddykb72xxw4vig9nhlc7"; - "17-linux-aarch64" = "0p9gx5iq730br9wvacxs4403anxnjln6mx8v0dl4w4lhikjxsy8x"; - "11-linux-amd64" = "0gy8jj9d9msmj0i44sysiwq3j2k2w2g47fhq6y1aq47n3kmwj9kv"; - "17-linux-amd64" = "0qk8rgbmnk84isnb33x5bbh17bnnmq9yqasfgy5p953min6pbxj7"; - "11-darwin-amd64" = "0agw6k3jn2jh8wyc9h8rvzlgs96qh4nlj0y8nyzsmidvwq2ahl00"; - "17-darwin-amd64" = "0l1il0rq48sw6sha9jr0xphjgrm7q0kywy8z94mabm9maqh7l3rn"; + "11-linux-aarch64" = "135zkpqm8z5nzcyn5h6vdx3c09f9wb6jgzmp0llcnx8w76p71154"; + "17-linux-aarch64" = "0pij3kh70lxrzmbzx8zw97f9nb0rr492l7x3n13wcr859cr8akas"; + "11-linux-amd64" = "0ppvsgs216jmm5p8m34lqg2kv0awadh1dlkxb7qzcw2b6x0grzf0"; + "17-linux-amd64" = "1gf0jfmqy8lp6w7bimjp0j5abzmi0ndsn4hcjvfv7123lbj52zkz"; + "11-darwin-amd64" = "1mq6013crjmrpf3yvxwv9p4yn0rcdzg5z9hq9l6fpf47i8522k6p"; + "17-darwin-amd64" = "15l7p48vsca4cvqxbpb9lcmafysmdsxpv6avrpxajz705j3nsvmp"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/wasm-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-amd64" = "1l5av2v459q88zfl83877h7b3426z3d86kp6wqjvz2441brvidi0"; - "17-linux-amd64" = "100p1cgw0z4yfy4axb3gr32m8jnyx1f8bj6f6kk0mf3l8fv2kb7p"; - "11-darwin-amd64" = "06694n74dzsfwlli1sjdsrfbj9ngw7bhrcayvy4sgy2va5qpdjs0"; - "17-darwin-amd64" = "1qwg45q0760lsa62h0nk2zdv0r1npr82bh6p1z3md6pjppm7i025"; + "11-linux-amd64" = "0m8cqqqdks34b2zv7i6qw9kzqxi1rfqsmknqa9wm0b7dqaxx209g"; + "17-linux-amd64" = "12nszxp2yv35y8zkm94bnd0mnanah48y41r61ypymd19plaqmdxk"; + "11-darwin-amd64" = "00g6akpv0gkw8gcxfbgcyipn6gj25yr32k1lb7iqj08bq4f2zvk7"; + "17-darwin-amd64" = "1hd71qg0nmklyakl4cc29vl10fxalbyd2b5yn7x9iv6m0h1pp25g"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalpython/releases/download/vm-21.3.0/python-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix index 1751da3e8f..52397f78b8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-11-22"; + version = "unstable-2021-12-05"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "bf153b359e9ce3ebef9bca899eb7ed5bd9045c11"; - sha256 = "sha256-13Mvq4VWZxlye/kncJibCnfSECx4PeHMYLuX0xMkN3A="; + rev = "367c8215d99054892740ad74c690b106c45ebf60"; + sha256 = "sha256-xhTEiFR1RXMHtxmXlRof3O8monXEjstyWP3GClZmMuU="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix index 9cfb38109f..6a3b40066d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix @@ -119,7 +119,5 @@ stdenv.mkDerivation rec { } ''); - meta = sbclBootstrap.meta // { - updateWalker = true; - }; + meta = sbclBootstrap.meta; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix index cf52916605..c7c64c9d25 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -10,7 +10,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.13"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.13"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index fd3f31d3fe..ce2bd98f3d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.13" "8.14") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.15") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index d73d14c84a..7f65e6643c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with versions; switch coq.version [ - { case = range "8.10" "8.14"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.15"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl"; release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71"; release."1.1.3+coq8.13".sha256 = "06ndly736k4pmdn4baqa7fblp6lx7a9pxm9gvz1vzd6ic51825wp"; release."1.1.3+coq8.12".sha256 = "sha256:10j23ws8ymqpxhapni75sxbzz0dl4n9sgasrx618i7s7b705y2rh"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index 383151a1cb..b3bff95b5e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -1,22 +1,9 @@ { lib, fetchzip, mkCoqDerivation, coq, version ? null }: let - ocamlPackages = - coq.ocamlPackages.overrideScope' - (self: super: { - ppxlib = super.ppxlib.override { version = "0.15.0"; }; - # the following does not work - ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: { - src = fetchzip { - url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz"; - sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; - }; - }); - }); - release = { - "8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; - "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; + "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; + "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; "8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; "8.11.0+0.11.1".sha256 = "1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; @@ -29,9 +16,8 @@ in inherit version release; defaultVersion = with versions; - if isGe "4.12" coq.ocamlPackages.ocaml.version then null - else switch coq.version [ + { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } @@ -42,7 +28,7 @@ in useDune2 = true; propagatedBuildInputs = - with ocamlPackages; [ + with coq.ocamlPackages; [ cmdliner findlib # run time dependency of SerAPI ppx_deriving @@ -70,9 +56,6 @@ in let inherit (o) version; in { src = fetchzip { url = - if version == "8.14+rc1+0.14.0" - then "https://github.com/ejgallego/coq-serapi/archive/refs/tags/8.14+rc1+0.14.0.tar.gz" - else "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ if version == "8.11.0+0.11.1" then version else builtins.replaceStrings [ "+" ] [ "." ] version 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 ddc9f47c04..4fc26f4403 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -54,9 +54,9 @@ self: super: { # There's an open PR updating the lower bound for `network`: # > https://github.com/abhinav/pinch/pull/46 # With that said version tracked for `network` right now is 3.1.1.1 so we're - # replacing the network pinch uses with `network_3_1_2_5` for now. + # replacing the network pinch uses with `network_3_1_2_7` for now. pinch = super.pinch.overrideScope (self : super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); # We can remove this once fakedata version gets to 1.0.1 as the test suite @@ -1524,10 +1524,7 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - # substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363 - hercules-ci-agent = overrideCabal { preConfigure = '' - substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version" - ''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [ unmarkBroken @@ -2065,11 +2062,11 @@ self: super: { # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); # Fixes https://github.com/NixOS/nixpkgs/issues/140613 @@ -2104,7 +2101,7 @@ self: super: { # Needs brick > 0.64 nix-tree = super.nix-tree.override { - brick = self.brick_0_66; + brick = self.brick_0_66_1; }; # build newer version for `pkgs.shellcheck` diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 5c388504bc..bb2527b2e1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -127,7 +127,7 @@ self: super: { indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; - network = super.network_3_1_2_5; + network = super.network_3_1_2_7; ormolu = self.ormolu_0_4_0_0; OneTuple = super.OneTuple_0_3_1; parallel = doJailbreak super.parallel; 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 afc2a63bff..a46ff40c95 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 @@ -2032,6 +2032,7 @@ broken-packages: - hasql-dynamic-statements - hasql-generic - hasql-simple + - hasql-transaction-io - hastache - haste - haste-prim @@ -2219,6 +2220,7 @@ broken-packages: - hlongurl - hlrdb-core - hls-exactprint-utils + - hls-rename-plugin - hlwm - hmarkup - hmatrix-banded @@ -2598,6 +2600,7 @@ broken-packages: - introduction - intro-prelude - invert + - invertible - invertible-syntax - io-capture - io-choice @@ -5378,6 +5381,7 @@ broken-packages: - weather-api - webapi - webapp + - webauthn - WebBits - webby - webcloud 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 5365abd0ad..7bb891786b 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.22 +# Stackage LTS 18.23 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -280,6 +280,7 @@ default-package-overrides: - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 + - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -337,6 +338,7 @@ default-package-overrides: - cabal-flatpak ==0.1.0.2 - cabal-plan ==0.7.2.0 - cabal-rpm ==2.0.10 + - Cabal-syntax ==3.6.0.0 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -478,6 +480,7 @@ default-package-overrides: - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - cookie ==0.4.5 + - copr-api ==0.1.0 - core-data ==0.2.1.11 - core-program ==0.2.12.0 - core-text ==0.3.5.0 @@ -579,7 +582,7 @@ default-package-overrides: - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.18 + - deferred-folds ==0.9.18.1 - dejafu ==2.4.0.3 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -964,14 +967,14 @@ default-package-overrides: - guarded-allocation ==0.0.1 - H ==0.9.0.1 - hackage-db ==2.1.2 - - hackage-security ==0.6.0.1 + - hackage-security ==0.6.2.0 - haddock-library ==1.10.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 - hal ==0.4.8 - half ==0.3.1 - hall-symbols ==0.1.0.6 - - hamtsolo ==1.0.3 + - hamtsolo ==1.0.4 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.3.0 - happstack-server ==7.7.1.2 @@ -981,7 +984,7 @@ default-package-overrides: - hasbolt ==0.1.6.1 - hashable ==1.3.0.0 - hashable-time ==0.2.1 - - hashids ==1.0.2.4 + - hashids ==1.0.2.7 - hashing ==0.1.0.1 - hashmap ==1.3.3 - hashtables ==1.2.4.2 @@ -999,7 +1002,7 @@ default-package-overrides: - haskell-src ==1.0.3.1 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.7 + - haskell-src-meta ==0.8.8 - haskey-btree ==0.3.0.1 - hasktags ==0.72.0 - hasql ==1.4.5.3 @@ -1016,7 +1019,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.4.2.0 + - headroom ==0.4.3.0 - heap ==1.0.4 - heaps ==0.4 - hebrew-time ==0.1.2 @@ -1130,6 +1133,7 @@ default-package-overrides: - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 + - hspec-tmp-proc ==0.5.0.1 - hspec-wai ==0.11.0 - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 @@ -1335,7 +1339,7 @@ default-package-overrides: - lambdabot-core ==5.3.0.2 - LambdaHack ==0.10.3.0 - lame ==0.2.0 - - language-avro ==0.1.3.1 + - language-avro ==0.1.4.0 - language-bash ==0.9.2 - language-c ==0.9.0.1 - language-c-quote ==0.13 @@ -1706,6 +1710,7 @@ default-package-overrides: - packdeps ==0.6.0.0 - pager ==0.1.1.0 - pagination ==0.2.2 + - pagure ==0.1.0 - pagure-cli ==0.2 - pandoc ==2.14.0.3 - pandoc-dhall-decoder ==0.1.0.1 @@ -1747,6 +1752,7 @@ default-package-overrides: - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 + - pdc ==0.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1757,15 +1763,15 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.13.2.1 + - persistent ==2.13.2.2 - persistent-mtl ==0.2.2.0 - persistent-mysql ==2.13.0.2 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.2.1 - - persistent-qq ==2.12.0.1 - - persistent-sqlite ==2.13.0.3 + - persistent-postgresql ==2.13.2.2 + - persistent-qq ==2.12.0.2 + - persistent-sqlite ==2.13.0.4 - persistent-template ==2.12.0.0 - - persistent-test ==2.13.0.3 + - persistent-test ==2.13.0.4 - persistent-typed-db ==0.1.0.5 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 @@ -2429,13 +2435,14 @@ default-package-overrides: - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.2 - - tls ==1.5.6 + - tls ==1.5.7 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - tlynx ==0.5.1.1 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 + - tmp-proc ==0.5.0.1 - tomland ==1.3.2.0 - tonalude ==0.1.1.1 - topograph ==1.0.0.1 @@ -2576,7 +2583,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==5.0.1 + - versions ==5.0.2 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 @@ -2597,6 +2604,7 @@ default-package-overrides: - wai-middleware-auth ==0.2.5.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 + - wai-middleware-delegate ==0.1.2.4 - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.1 - wai-rate-limit ==0.1.0.0 @@ -2653,10 +2661,10 @@ default-package-overrides: - X11 ==1.10.2 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 - - x509 ==1.7.5 - - x509-store ==1.6.7 - - x509-system ==1.6.6 - - x509-validation ==1.6.11 + - x509 ==1.7.6 + - x509-store ==1.6.9 + - x509-system ==1.6.7 + - x509-validation ==1.6.12 - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 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 a0b69748b2..e037891b80 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 @@ -481,7 +481,7 @@ dont-distribute-packages: - atuin - audiovisual - aura - - aura_3_2_6 + - aura_3_2_7 - authoring - autonix-deps-kf5 - avers @@ -1030,6 +1030,7 @@ dont-distribute-packages: - edges - editable - effective-aspects-mzv + - eflint - egison - egison-pattern-src-haskell-mode - egison-pattern-src-th-mode @@ -1784,6 +1785,7 @@ dont-distribute-packages: - introduction-test - intset - invertible-hlist + - invertible-hxt - ion - ip - ipatch @@ -2546,6 +2548,7 @@ dont-distribute-packages: - reactor - readpyc - reanimate + - reanimate_1_1_5_0 - record-aeson - record-gl - record-preprocessor @@ -3057,6 +3060,7 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th + - traverse-code - treemap-html-tools - treersec - trek-app @@ -3210,6 +3214,7 @@ dont-distribute-packages: - warped - wavesurfer - wavy + - web-inv-route - web-mongrel2 - web-page - web-rep 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 e6b2ff48c9..48ef3d1515 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -972,11 +972,11 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_4; }); - hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }); + hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_4; }); # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. 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 222534de8a..8822a77d5f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2857,6 +2857,18 @@ self: { broken = true; }) {}; + "Cabal-syntax" = callPackage + ({ mkDerivation, Cabal }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.6.0.0"; + sha256 = "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa"; + libraryHaskellDepends = [ Cabal ]; + doHaddock = false; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -4683,6 +4695,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "DigitGroup" = callPackage + ({ mkDerivation, base, split }: + mkDerivation { + pname = "DigitGroup"; + version = "0.1.0.0"; + sha256 = "1g9bxrawx2ard4pm6rs9li0kk3wj5f5ll0b2l2dwc74i23anb9lz"; + libraryHaskellDepends = [ base split ]; + description = "Group the digits of numbers by lots"; + license = lib.licenses.bsd3; + }) {}; + "DigitalOcean" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hspec, lens, mtl, text, transformers, unordered-containers @@ -10968,6 +10991,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; + revision = "1"; + editedCabalFile = "0d9gih7mkm0k47351539x9vdjvjjysk1rvba88r214qsjxnh4kym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21000,8 +21025,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7.5"; - sha256 = "0wcq09q5jhvigfp8vshgs3yc170g7c39jz2m6jk2j6v0nji2lp40"; + version = "0.8"; + sha256 = "1cxgf1ly0hqlyn01jd7ipdvvw1mm5r4ifc7694a3dr2wv2pnq5c0"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -25639,6 +25664,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.1"; sha256 = "06x1l0a0dvzf8n2xmqny5qpsgdsl03xlh2z9x7wdxiykl8p4xd24"; + revision = "1"; + editedCabalFile = "16jz8x7dbc66vcnfam52pzxcic6c40rmixc5p1y3xds2f695i1xl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26416,6 +26443,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "alex_3_2_7_1" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + }: + mkDerivation { + pname = "alex"; + version = "3.2.7.1"; + sha256 = "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers directory ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "alex-meta" = callPackage ({ mkDerivation, alex, array, base, containers, happy , haskell-src-meta, QuickCheck, template-haskell @@ -36089,7 +36134,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "aura_3_2_6" = callPackage + "aura_3_2_7" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -36099,10 +36144,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.2.6"; - sha256 = "07sry2nf41f101ldcfcf2x5pp0w7qvlvl6m4j5bbkvxp3rmsjbx2"; - revision = "2"; - editedCabalFile = "02vbh06llfj3f1crf5nqkx8crkh3lhv3mi2zqanjhj1wx98r4g7v"; + version = "3.2.7"; + sha256 = "07ya2vd94grh6fs7k5kq25yh95xfk5mdqcgqq84anjz0phprq5z3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46823,7 +46866,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_0_66" = callPackage + "brick_0_66_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -46832,8 +46875,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.66"; - sha256 = "0iaa22vjjrgasd7mhchib6r8hr73b540iqmcw5dkidg95y9jr00z"; + version = "0.66.1"; + sha256 = "04acisnnrhhq0xh470wfqjyyym8wjv5zv93pmwklz84ypzfdw60a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48908,6 +48951,8 @@ self: { pname = "bytestring-encoding"; version = "0.1.1.0"; sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; + revision = "1"; + editedCabalFile = "0vfigz5181rpk6lcajdbljvsrip3nlwxly1pflc6isn24wcd2jn1"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring deepseq QuickCheck tasty tasty-hunit @@ -59284,23 +59329,25 @@ self: { }) {}; "cobot-io" = callPackage - ({ mkDerivation, array, attoparsec, base, binary, bytestring + ({ mkDerivation, array, attoparsec, base, binary, bytestring, cobot , containers, data-msgpack, deepseq, directory, hspec, http-conduit - , hyraxAbif, lens, linear, mtl, neat-interpolation, QuickCheck - , split, text, vector + , hyraxAbif, lens, linear, megaparsec, mtl, neat-interpolation + , parser-combinators, QuickCheck, split, text, vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.20"; - sha256 = "075s6rhzyldm5c9g27ljwhs8xyxghk8cpm2742l3h69j9y7v3xnc"; + version = "0.1.4.2"; + sha256 = "1gh51097r6z35vbvdfg8fasv00midmdxgya0b2acm3hbrjnrdvp4"; libraryHaskellDepends = [ - array attoparsec base binary bytestring containers data-msgpack - deepseq http-conduit hyraxAbif lens linear mtl split text vector + array attoparsec base binary bytestring cobot containers + data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec + mtl parser-combinators split text vector ]; testHaskellDepends = [ - array attoparsec base binary bytestring containers data-msgpack - deepseq directory hspec http-conduit hyraxAbif lens linear mtl - neat-interpolation QuickCheck split text vector + array attoparsec base binary bytestring cobot containers + data-msgpack deepseq directory hspec http-conduit hyraxAbif lens + linear megaparsec mtl neat-interpolation parser-combinators + QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = lib.licenses.bsd3; @@ -60868,8 +60915,8 @@ self: { ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "commandert"; - version = "0.1.1.0"; - sha256 = "0li8ja7j8386k5j7l6vczq3g74bnj0qrz4n4f1hkgf82sg333jxz"; + version = "0.1.1.1"; + sha256 = "02sdmba5ri40qx5j2bdx11h8k7b0ndik8wwzf3wki8c00y2jpmnd"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; description = "A monad for commanders"; @@ -73743,8 +73790,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.3.0"; - sha256 = "1b8yafkgr41lizgg3zvzwf5rx1hwr84pqsrhzyfbpjhl0kbwvn54"; + version = "1.3.1"; + sha256 = "1ndwwnvx89pz0rmkr5ba4gv7w2q2q8j9n3a31s9aibxd0qjd6ijx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74379,28 +74426,6 @@ self: { }) {}; "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.18"; - sha256 = "15yd5wqkksainhwwiq8vlf49ih2789wz9njv7050s5mr20b2rqy1"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_18_1" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -74420,7 +74445,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -78783,8 +78807,8 @@ self: { }: mkDerivation { pname = "disco"; - version = "0.1.0.0"; - sha256 = "1pnqqx6dlqzxk7am66d25lcs596xfh0fw81yhyikfcb5sf1z3mx1"; + version = "0.1.1.0"; + sha256 = "04z203dvqc6ipcw6mhnx63q2s2hlmvxy5d5v0ml2z53b4crbprha"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78887,6 +78911,35 @@ self: { broken = true; }) {}; + "discord-haskell-voice" = callPackage + ({ mkDerivation, aeson, async, base, binary, BoundedChan + , bytestring, conduit, discord-haskell, lens, mtl, network + , optparse-applicative, opus, process, safe-exceptions, saltine + , stm, stm-containers, text, time, unliftio, websockets, wuss + }: + mkDerivation { + pname = "discord-haskell-voice"; + version = "2.2.1"; + sha256 = "07vwd9l9aa87wfs8gpqdi39h0j2jvc7mdn48yzkn68canv1wf95q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary BoundedChan bytestring conduit + discord-haskell lens mtl network opus process safe-exceptions + saltine text time unliftio websockets wuss + ]; + executableHaskellDepends = [ + aeson async base binary BoundedChan bytestring conduit + discord-haskell lens mtl network optparse-applicative opus process + safe-exceptions saltine stm stm-containers text time unliftio + websockets wuss + ]; + description = "Voice support for discord-haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {opus = null;}; + "discord-hs" = callPackage ({ mkDerivation, base, discord-gateway, discord-rest, discord-types , hashable, mtl, url, websockets @@ -84788,6 +84841,33 @@ self: { broken = true; }) {}; + "eflint" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , exploring-interpreters, fgl, filepath, gll, haskeline, hxt, mtl + , network, regex-applicative, text, time, transformers + }: + mkDerivation { + pname = "eflint"; + version = "3.0.0.1"; + sha256 = "1cij1g1mrw41dn4c63bzkahya3li9v7pkzisj0v129p6ckypv7cc"; + revision = "1"; + editedCabalFile = "10bi07ilvvmglbgsc1xf2fq4vsndrqh9d6c823d897s4didcv8rk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory exploring-interpreters + fgl filepath gll hxt mtl network regex-applicative time + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory exploring-interpreters + fgl filepath gll haskeline hxt mtl network regex-applicative text + time transformers + ]; + description = "Simulation interpreter for FLINT policy descriptions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "egison" = callPackage ({ mkDerivation, base, containers, criterion, directory, exceptions , filepath, Glob, hashable, haskeline, HUnit, megaparsec, mtl @@ -86372,27 +86452,28 @@ self: { "ema" = callPackage ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup - , commonmark, commonmark-extensions, commonmark-pandoc, containers - , data-default, directory, filepath, filepattern, fsnotify + , commonmark, commonmark-extensions, commonmark-pandoc + , constraints-extras, containers, data-default, dependent-sum + , dependent-sum-template, directory, filepath, filepattern , http-types, lvar, megaparsec, monad-logger, monad-logger-extras , neat-interpolation, optparse-applicative, pandoc-types, parsec - , parser-combinators, relude, safe-exceptions, stm, text, time - , unicode-transforms, unionmount, unliftio, uri-encode, wai - , wai-middleware-static, wai-websockets, warp, websockets, yaml + , parser-combinators, relude, text, time, unicode-transforms + , unionmount, unliftio, uri-encode, wai, wai-middleware-static + , wai-websockets, warp, websockets, yaml }: mkDerivation { pname = "ema"; - version = "0.2.0.0"; - sha256 = "1pjgpy4rvpwvrdszppb51nys281aglbpjgx4yci9hklp0kbkkh9i"; + version = "0.4.0.0"; + sha256 = "1l44mmcghhgyyxxnannmqsabdbwdz5yka0vk3pbiziqjjlkjxpnj"; libraryHaskellDepends = [ aeson async base blaze-html blaze-markup commonmark - commonmark-extensions commonmark-pandoc containers data-default - directory filepath filepattern fsnotify http-types lvar megaparsec + commonmark-extensions commonmark-pandoc constraints-extras + containers data-default dependent-sum dependent-sum-template + directory filepath filepattern http-types lvar megaparsec monad-logger monad-logger-extras neat-interpolation optparse-applicative pandoc-types parsec parser-combinators relude - safe-exceptions stm text time unicode-transforms unionmount - unliftio uri-encode wai wai-middleware-static wai-websockets warp - websockets yaml + text time unicode-transforms unionmount unliftio uri-encode wai + wai-middleware-static wai-websockets warp websockets yaml ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; @@ -92267,15 +92348,15 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "fast-logger_3_1_0" = callPackage + "fast-logger_3_1_1" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time }: mkDerivation { pname = "fast-logger"; - version = "3.1.0"; - sha256 = "1qry775yd962zcx16k1syhx001hlkk15v6m6l3yylibhqh9b753y"; + version = "3.1.1"; + sha256 = "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -93174,6 +93255,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-dists_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cached-json-file, pdc + , text, time + }: + mkDerivation { + pname = "fedora-dists"; + version = "2.0.0"; + sha256 = "1igw3rl99g48c46qzclj15896c97qd8g02pdscjwm0zid83pbimk"; + libraryHaskellDepends = [ + aeson base bytestring cached-json-file pdc text time + ]; + description = "Library for Fedora distribution versions"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-haskell-tools" = callPackage ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP , optparse-applicative, process, simple-cmd, simple-cmd-args, split @@ -93193,6 +93290,28 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-haskell-tools_1_0" = callPackage + ({ mkDerivation, base, bytestring, csv, directory, extra + , fedora-dists, filepath, http-conduit, http-types + , optparse-applicative, process, simple-cmd, simple-cmd-args, split + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "1.0"; + sha256 = "13nqsf4p5cm9zzdryl09hcxsya5qn3h8q8wl1sz02jswkhwlhlzb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring csv directory extra fedora-dists filepath + http-conduit http-types optparse-applicative process simple-cmd + simple-cmd-args split time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-img-dl" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , http-directory, http-types, optparse-applicative, simple-cmd @@ -98261,6 +98380,8 @@ self: { pname = "foundation"; version = "0.0.26.1"; sha256 = "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d"; + revision = "1"; + editedCabalFile = "0ylg660ldg20jdy61jwlvj7x606m2wjs67djijk2i9db36sgpx00"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -102894,14 +103015,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "generic-lens_2_2_0_0" = callPackage + "generic-lens_2_2_1_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text }: mkDerivation { pname = "generic-lens"; - version = "2.2.0.0"; - sha256 = "0n61hrfciryl33w6vxd5p1yqjfxl02n717dahlvb6fxlg9339nxp"; + version = "2.2.1.0"; + sha256 = "17an4669igzs6pwzqxnpkx9gmxwz64p32d1zcinhh5agd56y70pa"; libraryHaskellDepends = [ base generic-lens-core profunctors text ]; @@ -102924,12 +103045,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "generic-lens-core_2_2_0_0" = callPackage + "generic-lens-core_2_2_1_0" = callPackage ({ mkDerivation, base, indexed-profunctors, text }: mkDerivation { pname = "generic-lens-core"; - version = "2.2.0.0"; - sha256 = "0nj6ldwfidbyid85076gy8f5sa02xnbdhn51pkyg4dfqqz4r4hg8"; + version = "2.2.1.0"; + sha256 = "08i4c9yb6z84iknrnl9f3f343121j7ilp0a679v81nsjm9xz3rlf"; libraryHaskellDepends = [ base indexed-profunctors text ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; @@ -103042,14 +103163,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "generic-optics_2_2_0_0" = callPackage + "generic-optics_2_2_1_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, optics-core, text }: mkDerivation { pname = "generic-optics"; - version = "2.2.0.0"; - sha256 = "1iy7m5rs7rhk38zipwc018vcbkvlkpyr0rljkms6v0ajsvgkb783"; + version = "2.2.1.0"; + sha256 = "1bw7bbkrd1sfshzx7v1nbdnkxc82krw96x7vnl7myz9748m4472z"; libraryHaskellDepends = [ base generic-lens-core optics-core text ]; @@ -115015,8 +115136,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.0.3"; - sha256 = "1mqfp7r7l4p3xfh9scnqa0fh23vm50klg5aw1l15xh8slip11qx7"; + version = "0.6.0.4"; + sha256 = "0w0nbrbv7vb9i19wqn1za1prhj9bglqm1ac0sp1jpv8vbksiv21w"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson mtl QuickCheck @@ -115936,8 +116057,8 @@ self: { }: mkDerivation { pname = "graph-trace"; - version = "0.1.0.0"; - sha256 = "1nxmj3gd77ffy0441ikvassy5figb5cgav3qbwmgir10jnrqhhbl"; + version = "0.1.0.1"; + sha256 = "1pwlgn5w4rxrd0bx69d76li2cadfzfii79ynxvay9fp719bqgbqn"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-prim random syb template-haskell transformers @@ -115954,6 +116075,8 @@ self: { pname = "graph-trace-dot"; version = "0.1.1.1"; sha256 = "11hwxccy7yaz3mwixp1gjlpdfi9525ydqlbmpgyasg9ndg7dvl8i"; + revision = "1"; + editedCabalFile = "0caa9xcxwrqzqwsl76kmwv3fq9klsnm7wamrwjs8lrliyxcriwl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119603,50 +119726,21 @@ self: { "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, time, transformers - , unordered-containers, vector, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.6.0.1"; - sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "9"; - editedCabalFile = "14g1zr05qcvrn5ghhjmk6pz9h2ypa84bgqddxm0sk0qxbzpnxmqi"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - lukko mtl network network-uri parsec pretty tar template-haskell - time transformers zlib - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary time - unordered-containers vector zlib - ]; - description = "Hackage security library"; - license = lib.licenses.bsd3; - }) {}; - - "hackage-security_0_6_1_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , bytestring, Cabal, Cabal-syntax, containers, cryptohash-sha256 + , directory, ed25519, filepath, ghc-prim, lukko, mtl, network + , network-uri, parsec, pretty, QuickCheck, tar, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, text, time , transformers, unordered-containers, vector, zlib }: mkDerivation { pname = "hackage-security"; - version = "0.6.1.0"; - sha256 = "063p07hc1v1whlrwrzf0rzb6gzmba2x208ij1f2wz03zx2gsxwwb"; + version = "0.6.2.0"; + sha256 = "1jqpxcpsrixpvficqw5vdfrksg568967ncmisnd3j3jw3sxja5q8"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - lukko mtl network network-uri parsec pretty tar template-haskell - time transformers zlib + Cabal-syntax containers cryptohash-sha256 directory ed25519 + filepath ghc-prim lukko mtl network network-uri parsec pretty tar + template-haskell time transformers zlib ]; testHaskellDepends = [ aeson base bytestring Cabal containers network-uri QuickCheck tar @@ -119655,7 +119749,6 @@ self: { ]; description = "Hackage security library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hackage-security-HTTP" = callPackage @@ -120659,10 +120752,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.15.1.0"; - sha256 = "18nhpnhi63xvmb14khw1ad8rwj2lxdyhpc58gnmr9vb5zz2db6bh"; - revision = "1"; - editedCabalFile = "1kxdvh7250nvfdz5wnchyqhghhp05i06sfnjg9ar17p0wyqzv46z"; + version = "4.15.1.1"; + sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -121543,8 +121634,8 @@ self: { }: mkDerivation { pname = "hamtsolo"; - version = "1.0.3"; - sha256 = "0dbhpdfmbs6ydin2p75wqia9lcrw82gfv3kx8659gnw2ll3dmpnh"; + version = "1.0.4"; + sha256 = "1zgkwj2q3jpg6x6acrq2dbp0n0gps2wrrg2wx4ybpvy9vbw9qppc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -123555,18 +123646,6 @@ self: { }) {}; "hashids" = callPackage - ({ mkDerivation, base, bytestring, containers, split }: - mkDerivation { - pname = "hashids"; - version = "1.0.2.4"; - sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697"; - libraryHaskellDepends = [ base bytestring containers split ]; - testHaskellDepends = [ base bytestring containers split ]; - description = "Hashids generates short, unique, non-sequential ids from numbers"; - license = lib.licenses.mit; - }) {}; - - "hashids_1_0_2_7" = callPackage ({ mkDerivation, base, bytestring, containers, hedgehog, split }: mkDerivation { pname = "hashids"; @@ -123576,7 +123655,6 @@ self: { testHaskellDepends = [ base bytestring containers hedgehog split ]; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hashing" = callPackage @@ -125497,27 +125575,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, tasty, tasty-hunit, template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.7"; - sha256 = "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in"; - revision = "1"; - editedCabalFile = "1xf1rrbqa6fsr072xv4j4h687kk3glr9vlf16as6pdfaq7h5mz73"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit - template-haskell - ]; - description = "Parse source to template-haskell abstract syntax"; - license = lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_8" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans }: @@ -125534,7 +125591,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -127037,8 +127093,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.64.16"; - sha256 = "13dbx5szx87zhb5xq007lbpisr94593sf3a144a5052pbghcyj4s"; + version = "0.64.18"; + sha256 = "19prs0gz8klr52w0kiad7s26mpr352i4q98ixdn2409di4mzl42x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127085,8 +127141,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.64.16"; - sha256 = "01fgnbvwhxz4829ksv01165bvnhqyd3djjqm96819jp5r1ifzjin"; + version = "0.64.18"; + sha256 = "0kpzvl4xv4gxln9qcnlg658fakjr6j1yxxz8f6ixn8bsaqmaicrx"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -128361,6 +128417,24 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction-io" = callPackage + ({ mkDerivation, base, bytestring, bytestring-tree-builder, hasql + , mtl, resourcet, safe-exceptions, transformers, unliftio-core + }: + mkDerivation { + pname = "hasql-transaction-io"; + version = "0.1.0.0"; + sha256 = "0cqm6c4axivxvw5r35ass9qa0bmgxnz7n8d8l12vz78nsfxp76ci"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder hasql mtl resourcet + safe-exceptions transformers unliftio-core + ]; + description = "Perform IO actions during transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hasql-url" = callPackage ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty , tasty-quickcheck @@ -130194,21 +130268,23 @@ self: { "headroom" = callPackage ({ mkDerivation, aeson, base, doctest, either, extra, file-embed , generic-data, hspec, hspec-discover, http-client, http-types - , microlens, microlens-th, modern-uri, mtl, mustache - , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, req - , rio, string-interpolate, template-haskell, time, vcs-ignore, yaml + , microlens, microlens-aeson, microlens-th, modern-uri, mtl + , mustache, optparse-applicative, pcre-heavy, pcre-light + , persistent, persistent-sqlite, QuickCheck, req, rio + , string-interpolate, template-haskell, time, vcs-ignore, yaml }: mkDerivation { pname = "headroom"; - version = "0.4.2.0"; - sha256 = "1rg1n3pa6lh1a1flk8g8r5m1s77hl0cyd0c129rw8h1w2w2kkpj0"; + version = "0.4.3.0"; + sha256 = "17y1v6kfh1zbyqww5a4v54xqn06ix4ba8rr5dk8nfh5qsgf211d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base either extra file-embed generic-data http-client - http-types microlens microlens-th modern-uri mtl mustache - optparse-applicative pcre-heavy pcre-light req rio - string-interpolate template-haskell time vcs-ignore yaml + http-types microlens microlens-aeson microlens-th modern-uri mtl + mustache optparse-applicative pcre-heavy pcre-light persistent + persistent-sqlite req rio string-interpolate template-haskell time + vcs-ignore yaml ]; executableHaskellDepends = [ base optparse-applicative rio ]; testHaskellDepends = [ @@ -131633,8 +131709,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.8.4"; - sha256 = "1w93027i5kddn1rj5dgnmvgsadfv3s6ziyga4k3mp094wx2g6syy"; + version = "0.8.5"; + sha256 = "1m1hak1ckch84ld2x0pg7jz6gixxanbjdhslmlygpgxaq1757hax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136873,6 +136949,8 @@ self: { testHaskellDepends = [ base filepath hls-test-utils ]; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-retrie-plugin" = callPackage @@ -142335,8 +142413,8 @@ self: { pname = "hsass"; version = "0.8.0"; sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; - revision = "1"; - editedCabalFile = "0d085g21zvawl2jv6ap5fyk70c9igbjiwknvk1mgdydxbm1kvyq5"; + revision = "2"; + editedCabalFile = "11xmb3mssql6ksdra03h9cqv0pdxgyj3askapbgpx6rmziw7a136"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -145469,8 +145547,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.2.0"; - sha256 = "1rqqyrnny5wk4xql1ddavq72qcvdhblm7ga8728i42v14n6z80i4"; + version = "1.0.3.0"; + sha256 = "19kpxxmfampssas8xjicsxka3lyscgg8yh04vxvnyiz48rr00194"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -146968,8 +147046,8 @@ self: { ({ mkDerivation, base, cli-arguments, lists-flines }: mkDerivation { pname = "html-presentation-text"; - version = "0.2.0.0"; - sha256 = "08fxj4nbjz3smx7h552id5z984jbbfyfj9m5aabh5vj5gi5i9jwl"; + version = "0.2.1.0"; + sha256 = "16lnshmxhxwx31kb9nji68imb492bigcb11mngyi94xbs40jayrr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cli-arguments lists-flines ]; @@ -155008,8 +155086,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.5.0.0"; - sha256 = "02zxgkaa4wgacgj6si4158cxgk3cdf0gkvl5avmyrivbcc18xkdi"; + version = "0.5.0.1"; + sha256 = "1h1g9k71cihc1g0jfprvklcwlcw9ymihlvnsa1fy2mfr759xgjzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156156,15 +156234,16 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, foldl, hspec, QuickCheck, safe - , time, witherable + ({ mkDerivation, base, binary, containers, deepseq, foldl, hspec + , QuickCheck, safe, time, witherable }: mkDerivation { pname = "interval-algebra"; - version = "1.2.0"; - sha256 = "1n9db9p3v7da1d3j21lrm46s2py0m1rdfjpvilx43n7yd6630i81"; + version = "1.3.0"; + sha256 = "0qb23l8jsam2j58pvmqv3gcmxri1bsb1m8nayspssnrapwis0ig6"; libraryHaskellDepends = [ - base containers foldl QuickCheck safe time witherable + base binary containers deepseq foldl QuickCheck safe time + witherable ]; testHaskellDepends = [ base containers hspec QuickCheck safe time witherable @@ -156448,6 +156527,8 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "invertible-grammar" = callPackage @@ -156492,6 +156573,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -162363,6 +162445,8 @@ self: { pname = "katip"; version = "0.8.7.0"; sha256 = "1m74n6fyxczfgg3swkkgr6864mzji1l0dpwpxk5zd93488zrij9v"; + revision = "1"; + editedCabalFile = "14a0j9i7vn81qwsd343pswcamldhpyiic2nld57xw2lg50rdshfj"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -165960,8 +166044,8 @@ self: { }: mkDerivation { pname = "language-avro"; - version = "0.1.3.1"; - sha256 = "0b54041z1sfrd7fck975i8d69agxij6jml6mxlcr41y7ywvizq0l"; + version = "0.1.4.0"; + sha256 = "1x7279nk306pc9db8bav6aj5g36g338mzjnhkgl21dqxh1qb43rx"; libraryHaskellDepends = [ avro base containers directory filepath megaparsec text vector ]; @@ -170332,8 +170416,8 @@ self: { }: mkDerivation { pname = "libmdbx"; - version = "0.2.1.0"; - sha256 = "1v5gjp1hr4c1r5nbf4r2j3pd2kxl36b9xpphmmxqin7jfmpj5fjj"; + version = "0.2.1.1"; + sha256 = "0rh6zq1p6yz858m3mb5jfqydglw54gr7pvniyjvd3zprsr0pa0jf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176315,7 +176399,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp-types_1_4_0_0" = callPackage + "lsp-types_1_4_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable , hslogger, lens, mod, mtl, network-uri, rope-utf16-splay @@ -176324,8 +176408,8 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "1.4.0.0"; - sha256 = "0rzvjfn26qrgb7h21m20rvdc7x730z93lgmrz4m4l7g9s2xa7s3s"; + version = "1.4.0.1"; + sha256 = "0dxf5nnaxs2564hgjldkclhm5gvszjxxvz6gk00jmx0gf8k6dm8z"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq Diff directory dlist filepath hashable hslogger lens mod mtl network-uri @@ -181374,8 +181458,8 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.4.1.0"; - sha256 = "124wa7v8vx82gd04brgv3kphyqs0p5x9hp1vlp39bkha9w1yab7w"; + version = "0.4.2.0"; + sha256 = "002qwccn4nwd7ik78k3qq9jxchj1v57c0c4b56w8424xg5291lzk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182985,15 +183069,15 @@ self: { license = lib.licenses.mit; }) {}; - "microlens-aeson_2_4_0" = callPackage + "microlens-aeson_2_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , hashable, microlens, scientific, tasty, tasty-hunit, text , unordered-containers, vector }: mkDerivation { pname = "microlens-aeson"; - version = "2.4.0"; - sha256 = "103r9i4ky58y34rb82dmw20npbzzk4brn9nn4650m7mdzcgmz0zm"; + version = "2.4.1"; + sha256 = "0h11h1vg467aq1w6gfb0jvzvhk6xsl1i1bl7qfw5kdsnvrd3nbg9"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable microlens scientific text unordered-containers vector @@ -184819,8 +184903,8 @@ self: { pname = "mmark"; version = "0.0.7.4"; sha256 = "0flsg9jsnzab74hfidrfdmjvarj3n86db4ysv007j2hlr3iynnxx"; - revision = "1"; - editedCabalFile = "05021pxrdgymlk51zs72mbf6lg3j0zf9f0sim1qlhviwp0dwk5nv"; + revision = "2"; + editedCabalFile = "06sq65cmqr5yva4spf14bkdsvw465m73hjmvxcfh7vxn0nslp2bc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -187779,6 +187863,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.1.3"; + sha256 = "1nglki10rlpi872p55pa8g809q5sna7yzh3zw4rqfhq89kb15wcv"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -187865,10 +187969,10 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.2.0.0"; - sha256 = "1hd65flmygy2afvnpjcj7l06ic1lycb6x5gbxhgmxxb2ilj6h6wf"; - revision = "1"; - editedCabalFile = "146sy318bf3bdv2xjnpxv0i8g5q04hq32grdjqs2nw2javx2qlc1"; + version = "1.3.0.0"; + sha256 = "19k31vppid5lyvqg4q4r07yzw9yisydhx012yn1fzlfjwc89g9bp"; + revision = "3"; + editedCabalFile = "1jz12ww843d0qk7gy6f8fw4l2mpynkcs9knxfc865zyhcjvimfw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189905,8 +190009,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "mtl-uplift"; - version = "0.1.0.0"; - sha256 = "1y75za4xl941aadn3bmc3rsa2jklv8z0l4vkwz7x92pbxv5ym8xq"; + version = "0.1.0.1"; + sha256 = "01f70cwsy8qinwsmh27js8165bmqkr6ykzmwi2r3svlpxpaiiazk"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl ]; description = "Lift substacks of monad transformer stacks"; @@ -192972,8 +193076,8 @@ self: { pname = "nanovg"; version = "0.8.0.0"; sha256 = "1il4305wv7f53225jv5s04nf7gf5rw6cfxm8j3v1di2xvhdingz5"; - revision = "1"; - editedCabalFile = "0m69iqs8jaqh1gq1vfp92j2adf05v0isakl3ijxf7akxs5j2i3da"; + revision = "2"; + editedCabalFile = "1vvlmbvpafvqawfph2aicysy9nklm8rqdz2bdpkq0kg4dgi72jr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -194551,14 +194655,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_5" = callPackage + "network_3_1_2_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.5"; - sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; + version = "3.1.2.7"; + sha256 = "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -200916,8 +201020,8 @@ self: { }: mkDerivation { pname = "openai-hs"; - version = "0.2.1.0"; - sha256 = "1b92hkah0ac3mac8lcfvq9c37wfk9hfgcd0nzhpznqsk72zhb4v6"; + version = "0.2.2.0"; + sha256 = "07jyz6bgz2s21j5w5avpi7hllcxw9ix3m3r1lyjb0kwa5rvvpl7d"; libraryHaskellDepends = [ aeson base bytestring casing cpphs http-client http-types openai-servant servant servant-client servant-multipart-client text @@ -200939,8 +201043,8 @@ self: { }: mkDerivation { pname = "openai-servant"; - version = "0.2.1.0"; - sha256 = "0cwr8mz1kdc3xp5a5g5d08amgy9y6h79k0l0w6ypafr9yf6braw8"; + version = "0.2.2.0"; + sha256 = "1h9g7sak3142hlw83dlb8h5q5fkdgy6rz81syidq0cvg8hzx9bzq"; libraryHaskellDepends = [ aeson base bytestring casing servant servant-multipart-api text time vector @@ -204680,8 +204784,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.12.1"; - sha256 = "036lw5qa23bg292hgfj3ybfykbqj80fb2f8a26rnivj5pfqblm3w"; + version = "0.3.12.2"; + sha256 = "1d2g4aggv47gv83p4382bcy1x97z0bs4nqww37ay92n9r4jh6m4l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209701,10 +209805,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.2.1"; - sha256 = "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k"; - revision = "1"; - editedCabalFile = "15lx2kd8ijn91h65nhzxmd50hmmybhs6x6qfg5wnl3ylcmgi6glg"; + version = "2.13.2.2"; + sha256 = "1pj5svwf85b0yndixlcqzjpqwp50zfqra99qm7hf1hlwq5g4amy9"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -210161,8 +210263,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.2.1"; - sha256 = "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir"; + version = "2.13.2.2"; + sha256 = "0giwwndy8f6pr4xvqgkv939x93r3sj2a6rkz4v8xrrrvmgq9hbpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210226,8 +210328,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.1"; - sha256 = "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p"; + version = "2.12.0.2"; + sha256 = "0pzlhwl4h9q358zc6d0m5zv0ii2yhf2lzw0a3v2spfc1ch4a014a"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -210345,8 +210447,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.0.3"; - sha256 = "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338"; + version = "2.13.0.4"; + sha256 = "1lvjdh2c4c7z8z8fsl8bz5rygnkph6ql01jnn53mp0v98crk2s9w"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -210412,8 +210514,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.13.0.3"; - sha256 = "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs"; + version = "2.13.0.4"; + sha256 = "0vcq5wg63py4k5nv5042lcdzz24wbpwzhd2ww02ijf5wmgqqg63p"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations http-api-data HUnit monad-control @@ -215450,8 +215552,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.4.0"; - sha256 = "0mh6iiyz859446l8r54bqg8hmaig40kdapq9k4niry35nba6fdr1"; + version = "0.4.4.1"; + sha256 = "1zw8n16dm2l8rwrf014kb9jhp3q4a719bp8p08s4fnlksqkf88vl"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -215682,8 +215784,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.4.2.0"; - sha256 = "106b9y3apffc84k9idb1vmfjjfwjww4xlpqn4mphrf7w2cxyn6gv"; + version = "0.4.3.0"; + sha256 = "0n7szglzj8jkb6cpkbj0496wd5k4cy4lvih026r6bcb7m943ki71"; libraryHaskellDepends = [ ansi-terminal async base polysemy polysemy-conc polysemy-time relude template-haskell text time @@ -215702,8 +215804,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.4.2.0"; - sha256 = "03ipk2085zr3mm7m2qyiixxf4gpmv0bbyw1s1ykqngh7f6d6f2pp"; + version = "0.4.3.0"; + sha256 = "1qhhhlbkvx4jxanfwgnnhn0yvhi2zp7sm3ssn3nc48vm1gzmb867"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time @@ -215723,8 +215825,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.4.2.0"; - sha256 = "0kmrwyfsldpaafkimfi4plx6ngppq0jj5mhrpknfg5v2ca9j691k"; + version = "0.4.3.0"; + sha256 = "0cy1iwybb4m6n2rivmzzp4ikj8n1qhw1k4f13xiwf98s7abasa5l"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time ]; @@ -229215,6 +229317,43 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "reanimate_1_1_5_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base + , base64-bytestring, bytestring, cassava, cereal, colour + , containers, cryptohash-sha256, cubicbezier, directory, filelock + , filepath, fingertree, fsnotify, geojson, hashable, hgeometry + , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl + , neat-interpolation, network, open-browser, optparse-applicative + , parallel, process, QuickCheck, random, random-shuffle + , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time + , unix, unordered-containers, vector, vector-space, websockets, xml + }: + mkDerivation { + pname = "reanimate"; + version = "1.1.5.0"; + sha256 = "0gy5s68d00szs1ljfcyisp19g3vz4i1mlbxpym0mymzc5v723wfa"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal array attoparsec base base64-bytestring + bytestring cassava cereal colour containers cryptohash-sha256 + cubicbezier directory filelock filepath fingertree fsnotify geojson + hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear + matrix mtl neat-interpolation network open-browser + optparse-applicative parallel process random random-shuffle + reanimate-svg split temporary text time unix unordered-containers + vector vector-space websockets xml + ]; + testHaskellDepends = [ + base bytestring directory filepath linear process QuickCheck tasty + tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck + tasty-rerun temporary text vector + ]; + description = "Animation library based on SVGs"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "reanimate-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, Diff , directory, double-conversion, filepath, hashable, JuicyPixels @@ -231641,8 +231780,8 @@ self: { }: mkDerivation { pname = "regex-rure"; - version = "0.1.0.2"; - sha256 = "1nqly1c2pg7c44jaajl3kj8hibybm5w8ly4ndyfgmrs60d2kzhyw"; + version = "0.1.1.0"; + sha256 = "1ap1cpm82dv9q9w8y6cf0rp9f5zvspnql9zr35fknaxaskr86zgj"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; @@ -251058,48 +251197,47 @@ self: { ({ mkDerivation, aeson, ansi-terminal, asn1-encoding, asn1-types , async, attoparsec, base, base64-bytestring, bytestring , composition, constraints, containers, cryptonite, cryptostore - , data-default, direct-sqlite, directory, file-embed, filepath - , generic-random, hspec, hspec-core, http-types, HUnit, ini - , iso8601-time, memory, mtl, network, network-transport - , optparse-applicative, process, QuickCheck, random, simple-logger - , sqlite-simple, stm, template-haskell, text, time, timeit, tls - , transformers, unliftio, unliftio-core, websockets, x509 - , x509-store, x509-validation + , data-default, direct-sqlite, directory, filepath, generic-random + , hspec, hspec-core, http-types, HUnit, ini, iso8601-time, memory + , mtl, network, network-transport, optparse-applicative, process + , QuickCheck, random, simple-logger, sqlite-simple, stm + , template-haskell, text, time, timeit, tls, transformers, unliftio + , unliftio-core, websockets, x509, x509-store, x509-validation }: mkDerivation { pname = "simplexmq"; - version = "1.0.0"; - sha256 = "0ldri2kp1hadsx9kbypkkijijak1c6zy2h5apj6kgnh7f9a851pm"; + version = "1.0.2"; + sha256 = "142jpsy8myjffx4c1iw21iv210wgnyikmr66bih4gm3xgbqniz9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random http-types iso8601-time memory - mtl network network-transport QuickCheck random simple-logger - sqlite-simple stm template-haskell text time tls transformers - unliftio unliftio-core websockets x509 x509-store x509-validation + filepath generic-random http-types iso8601-time memory mtl network + network-transport QuickCheck random simple-logger sqlite-simple stm + template-haskell text time tls transformers unliftio unliftio-core + websockets x509 x509-store x509-validation ]; executableHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random http-types ini iso8601-time - memory mtl network network-transport optparse-applicative process - QuickCheck random simple-logger sqlite-simple stm template-haskell - text time tls transformers unliftio unliftio-core websockets x509 - x509-store x509-validation + filepath generic-random http-types ini iso8601-time memory mtl + network network-transport optparse-applicative process QuickCheck + random simple-logger sqlite-simple stm template-haskell text time + tls transformers unliftio unliftio-core websockets x509 x509-store + x509-validation ]; testHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random hspec hspec-core http-types - HUnit iso8601-time memory mtl network network-transport QuickCheck - random simple-logger sqlite-simple stm template-haskell text time - timeit tls transformers unliftio unliftio-core websockets x509 - x509-store x509-validation + filepath generic-random hspec hspec-core http-types HUnit + iso8601-time memory mtl network network-transport QuickCheck random + simple-logger sqlite-simple stm template-haskell text time timeit + tls transformers unliftio unliftio-core websockets x509 x509-store + x509-validation ]; description = "SimpleXMQ message broker"; license = lib.licenses.agpl3Only; @@ -252021,14 +252159,14 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "skylighting_0_12_1" = callPackage + "skylighting_0_12_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.12.1"; - sha256 = "0aaxw2b6lwdnabm5p7nj7xv39lscypvzyivnsjrxham5qvgsvnn8"; + version = "0.12.2"; + sha256 = "11qzlbzw66ryp1n3fkkhh4g0g29zajs3kf7rv3byjvy9bny5qfi6"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -252074,7 +252212,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_12_1" = callPackage + "skylighting-core_0_12_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -252084,8 +252222,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.12.1"; - sha256 = "0lyiax1smgv729109h3yhbpm0l6r7rwrfmp2df2ypmh3k6s88rhf"; + version = "0.12.2"; + sha256 = "0zgwzk69ww8w88gaga9fnk2inf6rsqhy5hmj0i29xhd6pb78v92v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258537,8 +258675,8 @@ self: { pname = "stack"; version = "2.7.3"; sha256 = "0i2v5i6bg90n6i4clcaww8m8702d3y5z8r03xdizdisjhf0zijj7"; - revision = "1"; - editedCabalFile = "0j99hh3lf886qvf86xwgv9a0ps9vp40z2s3xnl4lr4mgn9f0lrvb"; + revision = "2"; + editedCabalFile = "0i1fgairidy8g8zcf9wim4cg2y2xsvknkyz7dnb1mzy02ls6kqjb"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -258616,8 +258754,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.3.1"; - sha256 = "0jsz28p1xpzh77r3mhjh98jsz3lnzirfvh9w64rcgxpacdyajwhf"; + version = "0.4"; + sha256 = "0m9wiy233lw6bp6gz4h2x8bdi0lwsjl36bzx6544cdp91vllkzj1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -260611,8 +260749,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.1"; - sha256 = "1gl4hladndwbjdb02hcb5mdirm9gnz23ayclh0wws8xsq23dv2b4"; + version = "0.2.3.2"; + sha256 = "0h81amww5caa8950nn124sn5804vdsvxz2nahwvx88hbgsgldpkg"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -273220,6 +273358,22 @@ self: { broken = true; }) {}; + "text-rope" = callPackage + ({ mkDerivation, base, deepseq, random, tasty, tasty-bench + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "text-rope"; + version = "0.1"; + sha256 = "0dfn8hjnw38zh9nw7wy2jfyg0acg9jpfhngj65aczb9qxv6yj3hv"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base deepseq text vector ]; + testHaskellDepends = [ base tasty tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base random tasty-bench text ]; + description = "Text lines and ropes"; + license = lib.licenses.bsd3; + }) {}; + "text-short" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, quickcheck-instances, tasty, tasty-hunit @@ -276983,8 +277137,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.6"; - sha256 = "0mr5p1h161bdhnkfx4mvlk1hqq89z0fh7z37jgrbx4i8aa61cs96"; + version = "1.5.7"; + sha256 = "16pp6q0r4l23l3qi8v4yn4gjdsck8mg2jy3x7m7z5g6v9047v7mq"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -279479,6 +279633,27 @@ self: { broken = true; }) {}; + "traverse-code" = callPackage + ({ mkDerivation, array, base, containers, ghc-prim, linear-generics + , primitive, tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "traverse-code"; + version = "0.1.1.1"; + sha256 = "0nz3zmmcvfsm6xsl6sy7c88dzdxglhjpk8h8sah2xdy58gwdgjd2"; + libraryHaskellDepends = [ + array base containers ghc-prim linear-generics primitive + template-haskell + ]; + testHaskellDepends = [ + base containers linear-generics primitive tasty tasty-hunit + template-haskell + ]; + description = "General data structure lifting for Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "traverse-with-class" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers @@ -286794,8 +286969,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; - revision = "1"; - editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1"; + revision = "2"; + editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289374,6 +289549,25 @@ self: { license = lib.licenses.mit; }) {}; + "vector-circular_0_1_4" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes + , nonempty-vector, primitive, semigroupoids, template-haskell + , vector + }: + mkDerivation { + pname = "vector-circular"; + version = "0.1.4"; + sha256 = "18aijs6yn01bv3zal7l0wsck0hd54bbhckjc67cvr8wmpqdk2xxw"; + libraryHaskellDepends = [ + base deepseq nonempty-vector primitive semigroupoids + template-haskell vector + ]; + testHaskellDepends = [ base hedgehog hedgehog-classes ]; + description = "circular vectors"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-clock" = callPackage ({ mkDerivation, array, base, binary, ghc-prim, hashable, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -290092,8 +290286,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "5.0.1"; - sha256 = "0m7c0iiws3j716a5wksv9dxfcsz6dlvpw147m7ah2b8pfjwqg48c"; + version = "5.0.2"; + sha256 = "1955mng820n4bmk5vb8h7whlcwnnvxmwbdp7bxabyfy536bkdb77"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators text ]; @@ -291276,8 +291470,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.14.2"; - sha256 = "0zd6zki6hx0bhqvy20yhvd3597nxaasl2665s7m64bi02qjgjwsj"; + version = "3.15"; + sha256 = "1b76crd9nib0pcgpwbrbwr88zij5wrc6hs240w3sg16zxhwpllh1"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -291309,8 +291503,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.4"; - sha256 = "1mkx2h7yjmq8djgg1pi3vlx2pq4armasa1hvam955p3x09vwbisk"; + version = "0.5.5"; + sha256 = "0p5ciadgkamgkzmay5rwc1mjs2wq8pqv21rbbbxlnjwmfsayrb9j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -294009,6 +294203,7 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -294396,22 +294591,36 @@ self: { }) {}; "webauthn" = callPackage - ({ mkDerivation, aeson, asn1-encoding, asn1-types, base - , base16-bytestring, base64-bytestring, bytestring, cborg, cereal - , containers, cryptonite, hashable, memory, serialise, text, x509 + ({ mkDerivation, aeson, asn1-encoding, asn1-parse, asn1-types, base + , base16-bytestring, base64-bytestring, binary, bytestring, cborg + , containers, cryptonite, deriving-aeson, directory, file-embed + , filepath, hashable, hourglass, hspec, hspec-expectations-json + , jose, lens, memory, monad-time, mtl, pem, QuickCheck + , quickcheck-instances, serialise, singletons, text, time + , unordered-containers, uuid, validation, x509, x509-store , x509-validation }: mkDerivation { pname = "webauthn"; - version = "0"; - sha256 = "1nmrxpc0q7bs4z7gnkxbm02qpp8c2rn48hxi52y1k4iqglp9mmp0"; + version = "0.1.1.0"; + sha256 = "1zjkx57k2j998gxi7gylq0d8djiwdi4b4b486msn4q998jn2h8qy"; libraryHaskellDepends = [ - aeson asn1-encoding asn1-types base base16-bytestring - base64-bytestring bytestring cborg cereal containers cryptonite - hashable memory serialise text x509 x509-validation + aeson asn1-encoding asn1-parse asn1-types base base16-bytestring + base64-bytestring binary bytestring cborg containers cryptonite + deriving-aeson file-embed hashable hourglass jose lens memory + monad-time mtl serialise singletons text time unordered-containers + uuid validation x509 x509-store x509-validation ]; - description = "Web Authentication API"; - license = lib.licenses.bsd3; + testHaskellDepends = [ + aeson asn1-encoding base bytestring containers cryptonite directory + filepath hourglass hspec hspec-expectations-json memory mtl pem + QuickCheck quickcheck-instances serialise singletons text uuid + validation x509 x509-store + ]; + description = "Relying party (server) implementation of the WebAuthn 2 specification"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webby" = callPackage @@ -298167,29 +298376,6 @@ self: { }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, containers, cryptonite, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "x509"; - version = "1.7.5"; - sha256 = "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i"; - revision = "1"; - editedCabalFile = "1z98llpggldy4yb7afcsn3r3q4vklvx2pqyrhy9fir5y2yd5l601"; - libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring containers - cryptonite hourglass memory mtl pem - ]; - testHaskellDepends = [ - asn1-types base bytestring cryptonite hourglass mtl tasty - tasty-quickcheck - ]; - description = "X509 reader and writer"; - license = lib.licenses.bsd3; - }) {}; - - "x509_1_7_6" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -298208,30 +298394,9 @@ self: { ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-store" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, directory, filepath, mtl, pem, tasty - , tasty-hunit, x509 - }: - mkDerivation { - pname = "x509-store"; - version = "1.6.7"; - sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp"; - revision = "1"; - editedCabalFile = "04h2h8kdzhd2fp3w4a834xc1n88b1jgrxlgcsynfn0iwpbsb41x7"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - directory filepath mtl pem x509 - ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; - description = "X.509 collection accessing and storing methods"; - license = lib.licenses.bsd3; - }) {}; - - "x509-store_1_6_9" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, mtl, pem, tasty , tasty-hunit, x509 @@ -298247,26 +298412,9 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; description = "X.509 collection accessing and storing methods"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-system" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pem, process, x509, x509-store - }: - mkDerivation { - pname = "x509-system"; - version = "1.6.6"; - sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"; - libraryHaskellDepends = [ - base bytestring containers directory filepath mtl pem process x509 - x509-store - ]; - description = "Handle per-operating-system X.509 accessors and storage"; - license = lib.licenses.bsd3; - }) {}; - - "x509-system_1_6_7" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pem, process, x509, x509-store }: @@ -298280,7 +298428,6 @@ self: { ]; description = "Handle per-operating-system X.509 accessors and storage"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-util" = callPackage @@ -298303,28 +298450,6 @@ self: { }) {}; "x509-validation" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, data-default-class, hourglass, memory - , mtl, pem, tasty, tasty-hunit, x509, x509-store - }: - mkDerivation { - pname = "x509-validation"; - version = "1.6.11"; - sha256 = "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - data-default-class hourglass memory mtl pem x509 x509-store - ]; - testHaskellDepends = [ - asn1-encoding asn1-types base bytestring cryptonite - data-default-class hourglass memory tasty tasty-hunit x509 - x509-store - ]; - description = "X.509 Certificate and CRL validation"; - license = lib.licenses.bsd3; - }) {}; - - "x509-validation_1_6_12" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, data-default-class, hourglass, memory , mtl, pem, tasty, tasty-hunit, x509, x509-store @@ -298344,7 +298469,6 @@ self: { ]; description = "X.509 Certificate and CRL validation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x86-64bit" = callPackage @@ -299461,6 +299585,29 @@ self: { broken = true; }) {}; + "xml-prettify-text" = callPackage + ({ mkDerivation, base, filepath, gauge, mtl, optparse-applicative + , protolude, tasty, tasty-golden, text, text-show, with-utf8 + }: + mkDerivation { + pname = "xml-prettify-text"; + version = "1.0.0.2"; + sha256 = "02rnglx1fm4xirpl1y0g3q34k593cbijg33hh77nzsp78qcnvfr9"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base mtl protolude text text-show ]; + executableHaskellDepends = [ + base optparse-applicative protolude text with-utf8 + ]; + testHaskellDepends = [ + base filepath protolude tasty tasty-golden text + ]; + benchmarkHaskellDepends = [ base gauge protolude ]; + description = "XML pretty printer"; + license = lib.licenses.gpl2Only; + }) {}; + "xml-push" = callPackage ({ mkDerivation, base, bytestring, crypto-random, handle-like , monad-control, monads-tf, peyotls, random, sasl, simple-pipe, stm diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix index 9583be9239..adb7a92617 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/obb.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "obb"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "babashka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc="; + sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/regina/default.upstream b/third_party/nixpkgs/pkgs/development/interpreters/regina/default.upstream deleted file mode 100644 index 481d9848f8..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/regina/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url https://sourceforge.net/projects/regina-rexx/files/regina-rexx/ -SF_version_dir -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 79296a8e04..4af6d9b0ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" ]; # aws-c-common misuses cmake modules, so we need diff --git a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index 944fba33d6..b20bdac908 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) -, nix -, nix_2_3 -, nixUnstable +, nixVersions }: stdenv.mkDerivation rec { @@ -39,16 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { - tests = { - # Assuming this package is picked up by these packages as expected. - inherit - nix - nixUnstable - nix_2_3 - ; - }; - }; + passthru.tests = nixVersions; meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.upstream b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.upstream deleted file mode 100644 index 74eb1a2ca8..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://botan.randombit.net/ -version_link 'Botan-[0-9]+([.][0-9]+)*[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -attribute_name botan2 -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/default.upstream b/third_party/nixpkgs/pkgs/development/libraries/botan/default.upstream deleted file mode 100644 index 43f6a3b268..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -url http://botan.randombit.net/download.html -version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.upstream b/third_party/nixpkgs/pkgs/development/libraries/eigen/default.upstream deleted file mode 100644 index c0c05efc46..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/eigen/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://eigen.tuxfamily.org/ -ensure_choice -version '.*/([-0-9.]+)[.]tar[.].*' '\1' -do_overwrite() { do_overwrite_just_version; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 40e07c5907..592c14579f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , docbook_xml_dtd_45 , docbook-xsl-nons @@ -54,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.2"; + version = "1.12.4"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c"; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -97,13 +96,6 @@ stdenv.mkDerivation rec { # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch - - # Tests don't respect the FLATPAK_BINARY override that was added, this is a workaround. - # https://github.com/flatpak/flatpak/pull/4496 (Can be removed once included). - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/96dbe28cfa96e80b23fa1d8072eb36edad41279c.patch"; - sha256 = "1jczk06ymfs98h3nsg245g0jwxvml7wg2x6pb7mrfpsdmrpz2czd"; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix index 858144b150..6873508eb7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; homepage = "https://www.flintlib.org/"; downloadPage = "https://www.flintlib.org/downloads.html"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix index 15bd5907af..b0a98f7b26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-LoyV1Wtugva6MTpREstP2rYMrHW2xR0qfEAIV1Fo1Ns="; + sha256 = "sha256-FZXIIzAxhd0QlJAV0q7spEa1pNFXutI0WFZbT3izN4M="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix index 474605fe76..884cebab2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix index 917a64f40e..f0ddd26900 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.17.2"; + version = "2.17.3"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-+WeEK7rWoUPAiAsgd5qT2bwDf+5IlP4uuyh7+i2L/HU="; + sha256 = "sha256-XpC5gb19jPakYS3QSgOU6WnGad+VEoEtxyT38d9Beug="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix index 7965c934df..378a7202f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index 081fa2f175..6ff8d54ca3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchurl, lib, darwin }: +{ lib +, stdenv +, fetchurl +, darwin +, openssl +}: -# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { pname = "live555"; - version = "2019.11.22"; + version = "2022.01.21"; - src = fetchurl { # the upstream doesn't provide a stable URL + src = fetchurl { urls = [ - "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" + "http://www.live555.com/liveMedia/public/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" + "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d"; + sha256 = "sha256-diV5wULbOrqMRDCyI9NjVaR6JUbYl9KWHUlvA/jjqQ4="; }; + nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + + buildInputs = [ openssl ]; + postPatch = '' - sed 's,/bin/rm,rm,g' -i genMakefiles - sed \ + substituteInPlace config.macosx-catalina \ + --replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \ + --replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib" + sed -i -e 's|/bin/rm|rm|g' genMakefiles + sed -i \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ - -i config.linux + config.linux '' + lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' @@ -27,7 +39,7 @@ stdenv.mkDerivation rec { runHook preConfigure ./genMakefiles ${{ - x86_64-darwin = "macosx"; + x86_64-darwin = "macosx-catalina"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; @@ -48,15 +60,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; - enableParallelBuilding = true; meta = with lib; { - description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; homepage = "http://www.live555.com/liveMedia/"; + description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isAarch64; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index a8d9b23cc8..fb5409a7e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; - downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; - updateWalker = true; license = licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.upstream b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.upstream deleted file mode 100644 index 96c5bc35d1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://gitlab.com/mdds/mdds -version_link 'mdds-.*[.]tar[.][a-z0-9]+$' -version '.*-([0-9.]+)[.]tar[.].*' '\1' - -do_overwrite(){ - ensure_hash - ensure_version - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix index b8ee4fb4e7..b7d31066de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; downloadPage = "https://mpir.org/downloads.html"; homepage = "https://mpir.org/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mysocketw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mysocketw/default.nix index 7997fc18d1..62bd7cea1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mysocketw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mysocketw/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl, cmake }: stdenv.mkDerivation rec { pname = "mysocketw"; - version = "031026"; - src = fetchurl { - url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz"; - sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; + version = "3.10.27"; + + src = fetchFromGitHub { + owner = "RigsOfRods"; + repo = "socketw"; + rev = version; + sha256 = "0xqcgwb1lyc2d8834sq5adbmggyn6vvb26jw20862sxa15j0qfd4"; }; - patches = [ ./gcc.patch ]; - + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -17,8 +19,6 @@ stdenv.mkDerivation rec { --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; - meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; license = lib.licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index bbf5bd9aa1..390227cfe9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -9,11 +9,6 @@ , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: -assert ( - lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) - "withPerl should not be disabled unless cross compiling" -); - # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as diff --git a/third_party/nixpkgs/pkgs/development/libraries/osip/default.upstream b/third_party/nixpkgs/pkgs/development/libraries/osip/default.upstream deleted file mode 100644 index ba0ed2a9b2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/osip/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://ftp.u-tx.net/gnu/osip/ -attribute_name libosip -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix index 8d3f3e9870..4596c5aaf4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { platforms = platforms.all; homepage = "http://www.phash.org"; downloadPage = "https://github.com/clearscene/pHash"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix index 57e8fb1a5a..15a1f8d62b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; - sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; + sha256 = "sha256-MczOYCAEcnAAO/tbDafirUMohMI9PNUJyG9HzzpeXSo="; }; patches = [ - # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3105) + # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3503) (fetchpatch { name = "use-gnuinstalldirs.patch"; - url = "https://github.com/pocoproject/poco/commit/9e8f84dff4575f01be02e0b07364efd1561ce66c.patch"; - sha256 = "1bj4i93gxr7pwx33bfyhg20ad4ak1rbxkrlpsgzk7rm6mh0mld26"; + url = "https://github.com/pocoproject/poco/commit/16a2a74f6c28c6e6baca2ba26b4964b51d8a1b74.patch"; + sha256 = "sha256-mkemG8UemJEUQxae1trKakhnJFJW0AufDYFAbmnINbY="; # Files not included in release tarball excludes = [ "Encodings/Compiler/CMakeLists.txt" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index ef053eba9c..d895472618 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -108,6 +108,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 1f893fb051..65ce74dac0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -108,6 +108,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 2a76409ce4..5943a80a70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -71,6 +71,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix index 2865ab0631..1f49afbacf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix @@ -8,20 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; }; - passthru = { - updateScript = '' - #!${runtimeShell} - cd ${toString ./.} - ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix - ''; - }; - - meta = { + meta = with lib; { description = "File open routines to safely open a file when in the presence of an attack"; - license = lib.licenses.asl20 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; homepage = "https://research.cs.wisc.edu/mist/safefile/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix index 8e55c8f412..cc71bca442 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "smooth"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; rev = "v${version}"; - sha256 = "sha256-4092Od/wCWe4br80Ry6mr8GpUIUeeF6sk3unELdfQJU="; + sha256 = "sha256-30qVXK54SDL2+ZPbTINZix4Ax1iOMg2WLeEDyAr77Og="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix index 406603e662..f2bc63d4f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [raskin]; license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index 7aef5ba747..7913f05354 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postInstall = let pcTemplate = fetchurl { - url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in"; + url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; }; in '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 1f63b2cfc8..5f25575148 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; - updateWalker = true; }; } ) diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix index 635aca9aa5..7f51342fbd 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -79,8 +79,8 @@ rec { patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12.1"; - hash = "sha256-7JVnosdcvmVFN3h6SIeeqcJFcyFkai//fFuzi7ThNMY="; + rev = "v0.8.12.2"; + hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -88,6 +88,7 @@ rec { "${patchSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" "${patchSrc}/0006-disable_failing_libc_tests.patch" "${patchSrc}/0007-namespace_via_init.patch" + "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" ]; buildInputs = [ readline cmark py-yajl ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix index fbddc4d72d..f364b73158 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/resholve.nix @@ -1,4 +1,5 @@ { lib +, stdenv , callPackage , python27Packages , installShellFiles @@ -17,7 +18,18 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ oildev python27Packages.configargparse ]; + propagatedBuildInputs = [ + oildev + /* + Disable configargparse's tests on aarch64-darwin. + Several of py27 scandir's tests fail on aarch64-darwin. Chain: + configargparse -> pytest-check-hook -> pytest -> pathlib2 -> scandir + TODO: drop if https://github.com/NixOS/nixpkgs/issues/156807 resolves? + */ + (python27Packages.configargparse.overridePythonAttrs (old: { + doCheck = stdenv.hostPlatform.system != "aarch64-darwin"; + })) + ]; patchPhase = '' for file in resholve; do 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 acc3db0bdb..cf97f904d9 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -1,5 +1,6 @@ [ "@angular/cli" +, "@antfu/ni" , "@antora/cli" , "@antora/site-generator-default" , "@astrojs/language-server" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 448945e43b..47adf03bdb 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -1165,15 +1165,6 @@ let sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; }; }; - "@babel/core-7.16.10" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.16.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.10.tgz"; - sha512 = "pbiIdZbCiMx/MM6toR+OfXarYix3uz0oVsnNtfdAGTcCTu3w/JGF8JhirevXLBJUu0WguSZI12qpKnx7EeMyLA=="; - }; - }; "@babel/core-7.16.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -1444,15 +1435,6 @@ let sha512 = "V2dopEtPUL4LD+e8UtMIZB6BbsmMsS/7E1ZAvWNINzBfi7Cf3X9MLCpzHVZT4HeeF1lQl72IRtqqVt2RUImwyA=="; }; }; - "@babel/parser-7.16.10" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.10.tgz"; - sha512 = "Sm/S9Or6nN8uiFsQU1yodyDW3MWXQhFeqzMPM+t8MJjM+pLsnFVxFZzkpXKvUXh+Gz9cbMoYYs484+Jw/NTEFQ=="; - }; - }; "@babel/parser-7.16.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -5935,13 +5917,13 @@ let sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A=="; }; }; - "@octokit/request-5.6.2" = { + "@octokit/request-5.6.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.2"; + version = "5.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"; - sha512 = "je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz"; + sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; "@octokit/request-error-2.1.0" = { @@ -6538,13 +6520,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.22.0" = { + "@putdotio/api-client-8.23.2" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.22.0"; + version = "8.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.22.0.tgz"; - sha512 = "IL/ubwW6y4Y84JVbdPTxvdD0PHdVPBzXCjijmoCJFaazXYXP9iUGNeph0u5nuG+3El0CSuMQ6fz2Em0ktoXqrw=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.23.2.tgz"; + sha512 = "G5arIdtmFmg0J05dcoHxfNP4dEF/SU7SZmQEvbhXt1WCNkV+D/zSGM4C9YkPU2b9UWZxgYyYbz644dmW4KDG9A=="; }; }; "@reach/router-1.3.4" = { @@ -7681,13 +7663,13 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.4.0" = { + "@types/eslint-8.4.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.0.tgz"; - sha512 = "JUYa/5JwoqikCy7O7jKtuNe9Z4ZZt615G+1EKfaDGSNEpzaA2OwbV/G1v08Oa7fd1XzlFoSCvt9ePl9/6FyAug=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz"; + sha512 = "GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA=="; }; }; "@types/eslint-scope-3.7.3" = { @@ -8050,6 +8032,15 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; + "@types/linkify-it-3.0.2" = { + name = "_at_types_slash_linkify-it"; + packageName = "@types/linkify-it"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz"; + sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; + }; + }; "@types/lodash-4.14.161" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -8086,6 +8077,15 @@ let sha512 = "h0MqA7rtP88vuMepODf1oomJLeuRAZfOiYdeGS3NYO4TMQs237TkA+bNehy7V5nfyCjPRuKrb0fnWMjncHak0g=="; }; }; + "@types/markdown-it-12.2.3" = { + name = "_at_types_slash_markdown-it"; + packageName = "@types/markdown-it"; + version = "12.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz"; + sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; + }; + }; "@types/material-design-lite-1.1.16" = { name = "_at_types_slash_material-design-lite"; packageName = "@types/material-design-lite"; @@ -8104,6 +8104,15 @@ let sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA=="; }; }; + "@types/mdurl-1.0.2" = { + name = "_at_types_slash_mdurl"; + packageName = "@types/mdurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz"; + sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="; + }; + }; "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -9211,31 +9220,31 @@ let sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g=="; }; }; - "@vue/compiler-core-3.2.28" = { + "@vue/compiler-core-3.2.29" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.28"; + version = "3.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.28.tgz"; - sha512 = "mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.29.tgz"; + sha512 = "RePZ/J4Ub3sb7atQw6V6Rez+/5LCRHGFlSetT3N4VMrejqJnNPXKUt5AVm/9F5MJriy2w/VudEIvgscCfCWqxw=="; }; }; - "@vue/compiler-dom-3.2.28" = { + "@vue/compiler-dom-3.2.29" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.28"; + version = "3.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz"; - sha512 = "KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.29.tgz"; + sha512 = "y26vK5khdNS9L3ckvkqJk/78qXwWb75Ci8iYLb67AkJuIgyKhIOcR1E8RIt4mswlVCIeI9gQ+fmtdhaiTAtrBQ=="; }; }; - "@vue/shared-3.2.28" = { + "@vue/shared-3.2.29" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.28"; + version = "3.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.28.tgz"; - sha512 = "eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.29.tgz"; + sha512 = "BjNpU8OK6Z0LVzGUppEk0CMYm/hKDnZfYdjSmPOs0N+TR1cLKJAkDwW8ASZUvaaSLEi6d3hVM7jnWnX+6yWnHw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -16709,22 +16718,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.4.9" = { + "cdk8s-1.4.10" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.9.tgz"; - sha512 = "J1XGPzgdTDYozqAJ4TQUyrXUY9BYpdQkCDNBFVVU1RatlARhh2Uj7217XnRuNI6CDyuhTGaDFFuSf3HPAHbYxg=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.10.tgz"; + sha512 = "k0dLzCGg0i7MJFG6wr9mvaq3aaGS2nbwkOtwojiHiGj3wMNLPgZwrZ37s6ZRhquWdZqkOnAfgU7QgxRNmE6wgw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.95" = { + "cdk8s-plus-22-1.0.0-beta.96" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.95"; + version = "1.0.0-beta.96"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.95.tgz"; - sha512 = "cJscI0F6VhDoMjXu9exsnPBVgo+kyODgNYfLFVArNcKImT9/fJum96MXpZJ3ZqBZnadlarCpSjmsDDLbrAHEIw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.96.tgz"; + sha512 = "BM1ZtZrbITxki/AXXGAVXHbrxRsREnU/VddrtjOEaS04LLvjpoNuEXX8dANyBwTMdMU1gCP0ghwHCxTHaTTfwQ=="; }; }; "cdktf-0.8.6" = { @@ -19391,22 +19400,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.41" = { + "constructs-10.0.42" = { name = "constructs"; packageName = "constructs"; - version = "10.0.41"; + version = "10.0.42"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.41.tgz"; - sha512 = "h8HytpdxtuO9PPndcvZGX90Silp9lCWxf0XlzGhWOGpZchIyDFR+pqy4n0eiyEsPcclPF0CMfCA3UcGugu3+vw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.42.tgz"; + sha512 = "NC/OGRj9a+TCBAuJP6jV99CFMtKEhyRmfMmyKX2WDdbedmmjKk0C2TXgaqGUqsj9PbS0guGP8B4cMIRzmf/7Xg=="; }; }; - "constructs-3.3.196" = { + "constructs-3.3.197" = { name = "constructs"; packageName = "constructs"; - version = "3.3.196"; + version = "3.3.197"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.196.tgz"; - sha512 = "0Sz3L28vykhG57fc2DljNBph2MBkedSZZcYIArv+wDYKm3vvio2PNMbK66FB9Vl+dKicE/RV9LDMD/Cd3MSelg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.197.tgz"; + sha512 = "s+sDpPt7JYyUixb6f89UIGfUp8cfSj9mJTvsbE1Kjc/ALZxpgg0yYwlV1UBoVVoKH0kzpX8S5EdbWkw1uLY7yw=="; }; }; "consume-http-header-1.0.0" = { @@ -23766,31 +23775,31 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "dockerfile-ast-0.4.1" = { + "dockerfile-ast-0.4.2" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.1.tgz"; - sha512 = "qM5/m+Ez4GOM3ILkG13+cPxwgIcuA/z3LmEPZf4VJ82f7T1DuVbz7ctw4IzWdbiecuXcs+C4fFVbo5priGnIIQ=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz"; + sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA=="; }; }; - "dockerfile-language-service-0.7.4" = { + "dockerfile-language-service-0.8.1" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.7.4"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.4.tgz"; - sha512 = "SxKqTMQshN6xr20qTeurUydI432+ZUrkfhMurknjPvhdTc5oheH+WeN1cqKKQrILlcVq7agbFlXH51sdempuGQ=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.8.1.tgz"; + sha512 = "bqrZ2FzG45w2Mzmak3oC5ecIl/edStygSFQ0i/8WGabb5k/w6zWwqDaHVgT8dkfogm+swHMQUu4WGTvVu1qLCA=="; }; }; - "dockerfile-utils-0.9.3" = { + "dockerfile-utils-0.9.4" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.3.tgz"; - sha512 = "tMPdbywzglQh7JieKL1vn7HyJoYwk8J8AyfyLaqkLJ5tRA/TSrOVK6R40C3bwEceYg875crMo8yHSkz09Fc6VA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.4.tgz"; + sha512 = "lqmCxVhaUyCUIz9dhzYVrHZLJG5hzdcwd29JcA/0o7xIx2VwvIctUE6SpK8ugLTNuwMx/oKU2YVLaRIX/CmQPg=="; }; }; "doctoc-2.1.0" = { @@ -32544,13 +32553,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-2.0.1" = { + "http-proxy-middleware-2.0.2" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz"; - sha512 = "cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.2.tgz"; + sha512 = "XtmDN5w+vdFTBZaYhdJAbMqn0DP/EhkUaAeo963mojwpKMMbw6nivtFKw07D7DDOH745L5k0VL0P8KRYNEVF/g=="; }; }; "http-signature-0.11.0" = { @@ -36604,13 +36613,13 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; - "jsdoc-3.6.7" = { + "jsdoc-3.6.9" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.7"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; - sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz"; + sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw=="; }; }; "jsdom-11.12.0" = { @@ -36730,13 +36739,13 @@ let sha512 = "iFpupZWQusVYGHaUPooaO6xVAtRp+o1EOMBS2FcJBZcWGbB8fRG3zzpeMSkoqu/Pjqtu7boh45V90CXtSmVfMQ=="; }; }; - "jsii-srcmak-0.1.453" = { + "jsii-srcmak-0.1.454" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.453"; + version = "0.1.454"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.453.tgz"; - sha512 = "cMH4f2r1c2ykXdlvvsbPy0DUGFCiphqJ6pdTMKT+R07nY+epHQ9aF/8BV38hGzxiqMVX+7f/FHJ6VYQYEnEXBw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.454.tgz"; + sha512 = "TN0J2q2QQ92bzJuxKheb0NNSChy2AqDK9TBznBsbzYqPv5QwNZIMsnPrD1HVJRPVvS5Vz8+VttNjVniLw4QArg=="; }; }; "json-bigint-1.0.0" = { @@ -37027,13 +37036,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.113" = { + "json2jsii-0.2.114" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.113"; + version = "0.2.114"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.113.tgz"; - sha512 = "H3SjBlxMhJ0k+zjEuxCMZwpwGfl8ECNoy2CPgiX33kSJsyNwJFM6Qo15DhS/mucgBh8p2wtfg93wdlYTfzNxMQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.114.tgz"; + sha512 = "g1xBiPKcsTydLpeNXqe+HXD8gM/Wod5zrTwJqPpjFP+QNaDOjjMLPjmGa5R4gHwyapOT7GbqLH9bZhY+jnl1lw=="; }; }; "json3-3.2.6" = { @@ -37774,13 +37783,13 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "klaw-3.0.0" = { + "klaw-4.0.1" = { name = "klaw"; packageName = "klaw"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; - sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; + url = "https://registry.npmjs.org/klaw/-/klaw-4.0.1.tgz"; + sha512 = "pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw=="; }; }; "klaw-sync-6.0.0" = { @@ -38818,13 +38827,13 @@ let sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; }; }; - "ln-telegram-3.8.0" = { + "ln-telegram-3.9.0" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.8.0.tgz"; - sha512 = "4T2YaRNvQtWLqjRENFSRO+B3qJE93X9nSX1TqFwWhdtp7Z3UHpd/YjxeAjPsH1lLTl2hY9FIDK3RiayJky6TVA=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.9.0.tgz"; + sha512 = "Desl/QCdnXwMh98n0p7KVY17X9W6hDDh+HrU+UaaNbAkjw8GN+VZRYSMTqLIPXCf5QhWDlpSA7EruTHzKOAwMw=="; }; }; "load-bmfont-1.4.1" = { @@ -40357,13 +40366,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.4.0" = { + "log4js-6.4.1" = { name = "log4js"; packageName = "log4js"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.4.0.tgz"; - sha512 = "ysc/XUecZJuN8NoKOssk3V0cQ29xY4fra6fnigZa5VwxFsCsvdqsdnEuAxNN89LlHpbE4KUD3zGcn+kFqonSVQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz"; + sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg=="; }; }; "logform-2.3.2" = { @@ -41186,6 +41195,15 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; + "markdown-it-anchor-8.4.1" = { + name = "markdown-it-anchor"; + packageName = "markdown-it-anchor"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.4.1.tgz"; + sha512 = "sLODeRetZ/61KkKLJElaU3NuU2z7MhXf12Ml1WJMSdwpngeofneCRF+JBbat8HiSqhniOMuTemXMrsI7hA6XyA=="; + }; + }; "markdown-it-deflist-2.1.0" = { name = "markdown-it-deflist"; packageName = "markdown-it-deflist"; @@ -44786,6 +44804,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "negotiator-0.6.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + }; "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { name = "negotiator"; packageName = "negotiator"; @@ -48352,15 +48379,6 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.10.0" = { - name = "paid-services"; - packageName = "paid-services"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.10.0.tgz"; - sha512 = "Uxq9yk+SFG9bVDDgVce5kQ0OXuTZ/jqk4V27rqPX6EnEMIQOHmf/zNRpsGBowUDUBOdstGYdyZQ4avp7w2Q92w=="; - }; - }; "paid-services-3.11.0" = { name = "paid-services"; packageName = "paid-services"; @@ -50134,13 +50152,13 @@ let sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; }; }; - "polished-4.1.3" = { + "polished-4.1.4" = { name = "polished"; packageName = "polished"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz"; - sha512 = "ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA=="; + url = "https://registry.npmjs.org/polished/-/polished-4.1.4.tgz"; + sha512 = "Nq5Mbza+Auo7N3sQb1QMFaQiDO+4UexWuSGR7Cjb4Sw11SZIJcrrFtiZ+L0jT9MBsUsxDboHVASbCLbE1rnECg=="; }; }; "polyraf-1.1.0" = { @@ -53123,13 +53141,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.212" = { + "pyright-1.1.214" = { name = "pyright"; packageName = "pyright"; - version = "1.1.212"; + version = "1.1.214"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz"; - sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz"; + sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g=="; }; }; "q-0.9.7" = { @@ -56246,13 +56264,13 @@ let sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; }; }; - "resolve-1.21.1" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.21.1"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.21.1.tgz"; - sha512 = "lfEImVbnolPuaSZuLQ52cAxPBHeI77sPwCOWRdy12UG/CNa8an7oBHH1R+Fp1/mUqSJi4c8TIP6FOIPSZAUrEQ=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-1.7.1" = { @@ -60665,13 +60683,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.179" = { + "sscaff-1.2.180" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.179"; + version = "1.2.180"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.179.tgz"; - sha512 = "mIAzYsIKkePDogi5yLv8fM0S8t5P3U+QEG9eZannpycDB8k0SAr0fxEhXuyskR96m1zqrqcgjEYYEzTTTwBKqQ=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.180.tgz"; + sha512 = "Cvyq1YACYkREBswBXckOPX31ega2XnRsDUqhKCWZwC+bI8UXBR2ijGnI+jW3x2tlFw7N+HyO3ZR2WfXqWjjS+Q=="; }; }; "ssh-config-1.1.6" = { @@ -72180,7 +72198,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-8.4.1" sources."nopt-5.0.0" sources."npm-bundled-1.1.2" @@ -72255,6 +72273,24 @@ in bypassCache = true; reconstructLock = true; }; + "@antfu/ni" = nodeEnv.buildNodePackage { + name = "_at_antfu_slash_ni"; + packageName = "@antfu/ni"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.12.0.tgz"; + sha512 = "f+uqWBuXoShLpLSaQKHeFUnoUdvMGx8xcXrtyfxK95RGx5guKJVo3kVb2JtLNWkzwYzQvtQ+q0hU9YwSDSTVSw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Use the right package manager"; + homepage = "https://github.com/antfu/ni#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; @@ -72982,7 +73018,7 @@ in sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" @@ -73328,7 +73364,7 @@ in sources."record-cache-1.1.1" sources."refpool-1.2.2" sources."remove-trailing-separator-1.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."secretstream-stream-2.0.0" sources."sha256-universal-1.2.1" @@ -73440,7 +73476,7 @@ in sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; }; dependencies = [ - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@medable/mdctl-api-1.0.62" sources."@medable/mdctl-core-1.0.62" sources."@medable/mdctl-core-schemas-1.0.62" @@ -73469,6 +73505,9 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/glob-7.2.0" + sources."@types/linkify-it-3.0.2" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" sources."@types/node-17.0.10" sources."@types/tough-cookie-2.3.8" @@ -73489,7 +73528,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."argsarray-0.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -73616,7 +73655,7 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."end-of-stream-1.4.4" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."es3ify-0.2.2" sources."escape-string-regexp-2.0.0" (sources."escodegen-1.14.3" // { @@ -73821,12 +73860,13 @@ in sources."isstream-0.1.2" (sources."js-yaml-3.14.1" // { dependencies = [ + sources."argparse-1.0.10" sources."esprima-4.0.1" ]; }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.7" // { + (sources."jsdoc-3.6.9" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-json-comments-3.1.1" @@ -73852,11 +73892,11 @@ in sources."jws-3.2.2" sources."keytar-4.13.0" sources."kind-of-6.0.3" - sources."klaw-3.0.0" + sources."klaw-4.0.1" sources."lcid-2.0.0" sources."levn-0.3.0" sources."lie-3.0.4" - sources."linkify-it-2.2.0" + sources."linkify-it-3.0.3" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.includes-4.3.0" @@ -73870,9 +73910,9 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."markdown-it-10.0.0" - sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.3" + sources."markdown-it-12.3.2" + sources."markdown-it-anchor-8.4.1" + sources."marked-4.0.10" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -74115,7 +74155,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requizzle-0.2.3" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -74367,7 +74407,7 @@ in sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/plugin-retry-3.0.9" sources."@octokit/plugin-throttling-3.5.2" - sources."@octokit/request-5.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" @@ -74492,7 +74532,7 @@ in sources."ajv-8.6.3" ]; }) - sources."@types/eslint-8.4.0" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -74684,7 +74724,7 @@ in sources."readdirp-3.6.0" sources."rechoir-0.6.2" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -74871,7 +74911,7 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" + sources."@babel/core-7.16.12" sources."@babel/generator-7.16.8" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" @@ -74899,7 +74939,7 @@ in sources."@babel/helper-wrap-function-7.16.8" sources."@babel/helpers-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -75049,13 +75089,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.15" sources."@vue/cli-ui-addon-widgets-4.5.15" - (sources."@vue/compiler-core-3.2.28" // { + (sources."@vue/compiler-core-3.2.29" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.28" - sources."@vue/shared-3.2.28" + sources."@vue/compiler-dom-3.2.29" + sources."@vue/shared-3.2.29" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -75767,7 +75807,7 @@ in sources."repeat-string-1.6.1" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -76183,7 +76223,7 @@ in sources."@babel/generator-7.16.8" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/template-7.16.7" sources."@babel/types-7.16.8" sources."@webassemblyjs/ast-1.11.1" @@ -76745,7 +76785,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + (sources."@babel/core-7.16.12" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -76768,7 +76808,7 @@ in sources."@babel/helper-validator-option-7.16.7" sources."@babel/helpers-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/template-7.16.7" sources."@babel/traverse-7.16.10" sources."@babel/types-7.16.8" @@ -76848,7 +76888,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkginfo-0.4.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-6.3.0" @@ -77696,7 +77736,7 @@ in sources."remark-parse-9.0.0" sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -77815,10 +77855,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.32.0"; + version = "11.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.32.0.tgz"; - sha512 = "W6s76ux/BsMQ619z5z/CnR/bGMb9Jx6rYH/tFURH4Eth9oBcwJW8xIarJB8R+Z8U4zTWN00wUVjs/JAuFGVLNw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.33.0.tgz"; + sha512 = "B0jG/bSjDBihGEpB4slDg/oxjOBbtmP91fOHTItfUuUTfNvGuWXMP707TlmqKlcCOq0rdzJWQD+3j+e2xD72HQ=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -78243,27 +78283,7 @@ in sources."ws-8.4.2" ]; }) - (sources."ln-telegram-3.8.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" - sources."@types/request-2.48.8" - sources."bolt09-0.2.1" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."ms-2.1.3" - sources."paid-services-3.10.0" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.2" - ]; - }) + sources."ln-telegram-3.9.0" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -78958,7 +78978,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.2.0" @@ -79173,7 +79193,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -79493,7 +79513,7 @@ in sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/types-7.16.8" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -79833,7 +79853,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.4.5" sources."ripemd160-2.0.2" sources."rndm-1.2.0" @@ -80241,7 +80261,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.2.0" @@ -80783,7 +80803,7 @@ in sources."registry-url-3.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -80960,10 +80980,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.81"; + version = "1.0.82"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.81.tgz"; - sha512 = "w72Dih5ouCqHXDidmE4Ulu+rd+pJ2wlxJfSUiBajYkpIqLMIBxLj6/Fn8UVjnydDx8uhti2VjzaVURHsPqlDVw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.82.tgz"; + sha512 = "lzvZVO555YM7Z39hA6Tyg28RMedCues7Wh3hv1RaAGZ7lyAkTT12kUELOg6jM+VQ0NZD+90sAcBk8NXNghuZkA=="; }; dependencies = [ sources."@jsii/check-node-1.52.1" @@ -80978,8 +80998,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.4.9" - sources."cdk8s-plus-22-1.0.0-beta.95" + sources."cdk8s-1.4.10" + sources."cdk8s-plus-22-1.0.0-beta.96" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -80992,7 +81012,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.196" + sources."constructs-3.3.197" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-5.0.1" @@ -81072,18 +81092,18 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.453" // { + (sources."jsii-srcmak-0.1.454" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.113" + sources."json2jsii-0.2.114" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.0" + sources."log4js-6.4.1" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -81117,7 +81137,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.179" + sources."sscaff-1.2.180" (sources."streamroller-3.0.2" // { dependencies = [ sources."fs-extra-10.0.0" @@ -81178,7 +81198,7 @@ in sources."@babel/generator-7.16.8" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/template-7.16.7" sources."@babel/types-7.16.8" sources."@cdktf/hcl2cdk-0.8.6" @@ -81223,7 +81243,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.41" + sources."constructs-10.0.42" sources."date-format-4.0.3" sources."debug-4.3.3" sources."decamelize-1.2.0" @@ -81347,7 +81367,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.453" // { + (sources."jsii-srcmak-0.1.454" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -81358,7 +81378,7 @@ in sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.0" + sources."log4js-6.4.1" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."mime-db-1.51.0" @@ -81797,10 +81817,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.21.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.0.tgz"; - sha512 = "EPAJw1fedBDBjaGXBOxqidUgsNE1Yget6Z96SmFHZswpujcM5WQa95hg2nHJhZqfYAtmEp9TTT0ewmeS8Z83BA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.1.tgz"; + sha512 = "+J77if2qoBt1KWC2nu5/1KnRpydEnZX28rL0MQC1RFicxiwQ77WKrtcTkm/qgvWGWt/OuX+T5734Crbh0pRGog=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -82173,7 +82193,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.4.0" + sources."log4js-6.4.1" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.0.4" @@ -82997,7 +83017,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -83277,7 +83297,7 @@ in sha512 = "d+x38jGi3b0gD4axhYdHcS6TX9T/Q6qndVbn3TQMbLdQxiGmBBoy/hB/AouXwEByg/XyBtmyDiaWxm7r0UfgQw=="; }; dependencies = [ - sources."pyright-1.1.212" + sources."pyright-1.1.214" ]; buildInputs = globalBuildInputs; meta = { @@ -83429,7 +83449,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" + sources."@babel/core-7.16.12" sources."@babel/generator-7.16.8" sources."@babel/helper-compilation-targets-7.16.7" sources."@babel/helper-environment-visitor-7.16.7" @@ -83448,7 +83468,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/template-7.16.7" sources."@babel/traverse-7.16.10" sources."@babel/types-7.16.8" @@ -83680,7 +83700,7 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -83836,7 +83856,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -84073,7 +84093,7 @@ in sources."punycode-2.1.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" @@ -84752,7 +84772,7 @@ in sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -84823,7 +84843,11 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.7" // { + dependencies = [ + sources."negotiator-0.6.2" + ]; + }) sources."agent-base-6.0.2" sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" @@ -85182,7 +85206,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-package-data-3.0.3" @@ -85267,7 +85291,7 @@ in sources."registry-url-5.1.0" sources."request-2.88.2" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -85674,7 +85698,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -86898,7 +86922,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + (sources."@babel/core-7.16.12" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -86934,7 +86958,7 @@ in sources."@babel/helper-wrap-function-7.16.8" sources."@babel/helpers-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" @@ -87431,7 +87455,7 @@ in sources."repeat-string-1.6.1" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-protobuf-schema-2.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -87706,15 +87730,15 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.7.3"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.3.tgz"; - sha512 = "+fY8JCuoL3T698EZKd78SF1RrGBGYZVRzRDLrWHaum3qx5gW8uMDX41rtaehX7/ZNH/WSuwyFtWh3/JWmjEAKw=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.8.0.tgz"; + sha512 = "7oxOu3PWDzsTkLbUIm1O61rgdNiM9j9tAt+T0R5m0TFG0NYypYBM77pfzAYmQFpHGHAstCtOaEYzEnp0IkRCnQ=="; }; dependencies = [ - sources."dockerfile-ast-0.4.1" - sources."dockerfile-language-service-0.7.4" - sources."dockerfile-utils-0.9.3" + sources."dockerfile-ast-0.4.2" + sources."dockerfile-language-service-0.8.1" + sources."dockerfile-utils-0.9.4" sources."vscode-jsonrpc-8.0.0-next.5" sources."vscode-languageserver-8.0.0-next.6" (sources."vscode-languageserver-protocol-3.17.0-next.12" // { @@ -88263,7 +88287,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."node-abi-3.5.0" sources."node-addon-api-3.2.1" @@ -88367,7 +88391,7 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" @@ -88525,7 +88549,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" ]; @@ -88550,7 +88574,7 @@ in sources."@babel/helper-validator-option-7.16.7" sources."@babel/helpers-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/plugin-proposal-object-rest-spread-7.16.7" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -88757,7 +88781,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -90111,7 +90135,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -90870,7 +90894,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.16.7" // { dependencies = [ @@ -92522,7 +92546,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-alpn-1.2.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ @@ -93095,7 +93119,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" + sources."@babel/core-7.16.12" sources."@babel/generator-7.16.8" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" @@ -93112,7 +93136,7 @@ in sources."@babel/helper-validator-option-7.16.7" sources."@babel/helpers-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/plugin-proposal-object-rest-spread-7.16.7" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -93290,7 +93314,7 @@ in }) sources."readable-stream-3.6.0" sources."redent-3.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -95595,7 +95619,7 @@ in dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" @@ -95628,7 +95652,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.16.12" sources."@babel/runtime-7.16.7" sources."@babel/template-7.16.7" sources."@babel/traverse-7.16.10" @@ -96078,7 +96102,7 @@ in sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - sources."@octokit/request-5.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" @@ -96164,7 +96188,7 @@ in sources."read-pkg-up-7.0.1" sources."rechoir-0.6.2" sources."request-light-0.5.7" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."run-async-2.4.1" sources."sanitize-filename-1.6.3" sources."semver-7.3.5" @@ -96891,7 +96915,7 @@ in sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -98178,7 +98202,7 @@ in sources."path-root-regex-0.1.2" sources."picomatch-2.3.1" sources."rechoir-0.7.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" @@ -98767,7 +98791,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -99173,7 +99197,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -99329,14 +99353,14 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.0.tgz"; - sha512 = "+bsDBss95q0SdgVzPJ6Kqu8kSHu91/9rEFs8mIrobGrdV30EtNLyvqTL4xwl3q8GkzRn7lJxNNjwSGwiAoZkiw=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.1.tgz"; + sha512 = "d6k9QnjrLDl7FXNqyXHaEV5voTuaJYZ/iWkub1gMBwG40CvGJpxMbLb1vcw4eGxV1DOLNRk81WSkgHsjj6RVyA=="; }; dependencies = [ sources."ansi-styles-4.3.0" - sources."async-3.2.2" + sources."async-3.2.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chalk-4.1.2" @@ -102025,30 +102049,31 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.7"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; - sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.9.tgz"; + sha512 = "bVrM2DT2iLmv6jd2IdTRk67tC4iaSDUicD+47y+cNCYlE8dccd4xZnlANG4M+OmGyV389bABSTKKfoPCOofbKw=="; }; dependencies = [ sources."@babel/parser-7.16.12" - sources."argparse-1.0.10" + sources."@types/linkify-it-3.0.2" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" + sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.9" sources."js2xmlparser-4.0.2" - sources."klaw-3.0.0" - sources."linkify-it-2.2.0" + sources."klaw-4.0.1" + sources."linkify-it-3.0.3" sources."lodash-4.17.21" - sources."markdown-it-10.0.0" - sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.3" + sources."markdown-it-12.3.2" + sources."markdown-it-anchor-8.4.1" + sources."marked-4.0.10" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" - sources."sprintf-js-1.0.3" sources."strip-json-comments-3.1.1" sources."taffydb-2.6.2" sources."uc.micro-1.0.6" @@ -102925,7 +102950,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -103103,7 +103128,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.22.0" // { + (sources."@putdotio/api-client-8.23.2" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103405,7 +103430,7 @@ in sources."isbinaryfile-4.0.8" sources."jsonfile-6.1.0" sources."lodash-4.17.21" - (sources."log4js-6.4.0" // { + (sources."log4js-6.4.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -104650,7 +104675,7 @@ in sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - (sources."@octokit/request-5.6.2" // { + (sources."@octokit/request-5.6.3" // { dependencies = [ sources."is-plain-object-5.0.0" ]; @@ -105016,7 +105041,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."node-fetch-2.6.7" // { dependencies = [ @@ -105143,7 +105168,7 @@ in sources."redent-3.0.0" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" @@ -107044,7 +107069,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -108099,7 +108124,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -108792,7 +108817,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nopt-5.0.0" sources."npmlog-6.0.0" sources."once-1.4.0" @@ -109053,7 +109078,7 @@ in sources."qs-6.4.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -109772,7 +109797,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" @@ -110431,7 +110456,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -110718,7 +110743,7 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-8.4.1" sources."nopt-5.0.0" sources."normalize-url-4.5.1" @@ -111954,7 +111979,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -112743,7 +112768,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.4.1" sources."repeating-2.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -113335,7 +113360,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" @@ -113565,7 +113590,7 @@ in sources."readable-stream-1.1.14" sources."readdirp-3.6.0" sources."require-in-the-middle-5.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."run-series-1.1.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -114110,7 +114135,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -114350,10 +114375,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.212"; + version = "1.1.214"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz"; - sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.214.tgz"; + sha512 = "miNDlJV7pfaZuzRD6NKbUebcC2Ko9P1IjbqNd0wcnFepaVxdhHgxl544GkM59tjYlS/YgwuiiCAzW/icIFI/9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -114500,7 +114525,7 @@ in sources."reduce-flatten-1.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -116014,7 +116039,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -116832,7 +116857,7 @@ in sources."perfect-scrollbar-1.5.5" sources."picomatch-2.3.1" sources."pluralize-8.0.0" - sources."polished-4.1.3" + sources."polished-4.1.4" sources."postcss-value-parser-4.2.0" sources."prismjs-1.26.0" sources."process-0.11.10" @@ -117047,7 +117072,7 @@ in sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" sources."redent-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.1" @@ -121538,7 +121563,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -121812,10 +121837,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.2.0"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz"; - sha512 = "i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.3.0.tgz"; + sha512 = "PZXSwtJe4f4qBPWBwAbHL0M0Qjrv8iHN+cLpUNsffaVMS3YzpDDRI73+2lsqLAYfQEzxRwpll6BDKImREbpHWA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -121967,7 +121992,7 @@ in }) sources."redent-3.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -121993,20 +122018,26 @@ in sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.2.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."supports-preserve-symlinks-flag-1.0.0" sources."svg-tags-1.0.0" sources."table-6.8.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."typedarray-to-buffer-3.1.5" + sources."typedarray-to-buffer-4.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."write-file-atomic-4.0.0" sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yargs-parser-20.2.9" @@ -123124,7 +123155,7 @@ in sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."readdirp-3.6.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -123555,7 +123586,7 @@ in sources."remark-parse-9.0.0" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.6.3" sources."semver-5.7.1" (sources."slice-ansi-4.0.0" // { @@ -123936,7 +123967,7 @@ in sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -127406,7 +127437,7 @@ in sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - sources."@octokit/request-5.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" @@ -128420,7 +128451,7 @@ in sources."path-parse-1.0.7" sources."readable-stream-3.6.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-3.0.2" sources."rw-1.3.3" sources."safe-buffer-5.2.1" @@ -128815,7 +128846,7 @@ in sources."punycode-2.1.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" @@ -129081,7 +129112,7 @@ in src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.6" - sources."@types/eslint-8.4.0" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -129315,7 +129346,7 @@ in sources."readdirp-3.5.0" sources."rechoir-0.7.1" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" @@ -130350,7 +130381,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -131444,7 +131475,7 @@ in sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; }; dependencies = [ - sources."@types/eslint-8.4.0" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" @@ -131577,7 +131608,7 @@ in sources."path-parse-1.0.7" sources."pkg-dir-4.2.0" sources."rechoir-0.7.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."shallow-clone-3.0.1" @@ -131729,7 +131760,7 @@ in sources."http-errors-1.8.1" sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" - sources."http-proxy-middleware-2.0.1" + sources."http-proxy-middleware-2.0.2" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -132904,7 +132935,7 @@ in sources."ms-2.0.0" sources."multimatch-5.0.0" sources."mute-stream-0.0.7" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -133114,7 +133145,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 6305648119..581890178e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml ]; - createFindlibDestdir = true; - - buildPhase = "make all opt CPPFLAGS=-Wno-error"; - - installPhase = "make install-opt"; + buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; + installTargets = "install-opt"; + preInstall = '' + # Fix 'dllmllibvirt.so' install failure into non-existent directory. + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; meta = with lib; { description = "OCaml bindings for libvirt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix index 6588d6db7f..192e7258c4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchurl, buildDunePackage -, ppx_tools_versioned -, ocaml-migrate-parsetree +{ lib +, fetchurl +, buildDunePackage +, ounit +, ppx_deriving +, ppx_sexp_conv +, ppxlib }: +lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0") + "ppx_import is not available with ppxlib-${ppxlib.version}" + buildDunePackage rec { pname = "ppx_import"; - version = "1.8.0"; + version = "1.9.1"; useDune2 = true; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.05"; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz"; - sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv"; + url = "https://github.com/ocaml-ppx/ppx_import/releases/download/${version}/ppx_import-${version}.tbz"; + sha256 = "1li1f9b1i0yhjy655k74hgzhd05palz726zjbhwcy3iqxvi9id6i"; }; propagatedBuildInputs = [ - ppx_tools_versioned ocaml-migrate-parsetree + ppxlib ]; + checkInputs = [ + ounit + ppx_deriving + ppx_sexp_conv + ]; + + doCheck = true; + meta = { - description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; + description = "A syntax extension for importing declarations from interface files"; license = lib.licenses.mit; homepage = "https://github.com/ocaml-ppx/ppx_import"; }; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix new file mode 100644 index 0000000000..c6417fd551 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/ds/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, pcre2, php }: + +buildPecl { + pname = "ds"; + + version = "1.4.0"; + sha256 = "1vwk5d27zd746767l8cvbcdr8r70v74vw0im38mlw1g85mc31fd9"; + + buildInputs = [ pcre2 ]; + + internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; + + meta = with lib; { + description = "An extension providing efficient data structures for PHP"; + license = licenses.mit; + homepage = "https://github.com/php-ds/ext-ds"; + maintainers = teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 9d6e49cfdf..c8caf18aa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.3"; + version = "3.19.4"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20="; + sha256 = "sha256-b/uAmrFdAtmXUjaW038mKeZgWHCSIEzCZvCy/9Z3ghw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index b51f5f1656..52cc85b48f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8="; + hash = "sha256-DN4oH3Ajppj3YDDj8O+WxBS2/5qKvmrK0OTLOdhAmww="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 92e87e1ab1..664d523f94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.1.0"; + version = "22.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM="; + sha256 = "sha256-n6OkyMh3HxsFY2zXqbpdvbv5NdFC+J30tW/tLEEaSeU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 55153f5cf4..1410d6a5a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA="; + hash = "sha256-oPRytvSOjUoBUSQOFu5B/OljqmAk/rcRBl/oU+aSZjw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 20272b35ca..797b320e42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA="; + hash = "sha256-hG/Im+gYBXIs1o7cw6LDS9nb2HPYjnSd7g8bpVG6rkE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index beae6671be..6d9d33e449 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0="; + hash = "sha256-yIF9a63p8QnR1FazP/J8j9W8XnYAjWD9AKZHTGc4BfQ="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index f148f34e00..4186ad210c 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.18.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "0akrwvq1f87lyckzwgpd16aljsbqjwwliv7j9czal7f216nbkvv6"; + sha256 = "09xvkbdfhkrdkn8axb6bhi7p12lm2z1z84rx1wksfw9mffqk90v9"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 545eef7f6d..d71539efc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5f831ff09573247579c0dabe7854324620d176143b28cc4ef2e71ca49791dcc"; + sha256 = "68deed8ee884dd0b9631804e8b9c65fcd94e8e01c7218beae96a9fe557d7a0d7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 5166c8ead8..37a30147aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "20.0.0"; + version = "20.1.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca"; + sha256 = "4fbb2158320e0bdd367882642f266a6dfb3b4b8610792b3afbbca39089f212d7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index ad7930016a..cd19e88e9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a58750df23d5d4cb8eff283a93312e933ee3ef4272324576005c3dc8c22ce944"; + sha256 = "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix index 03a4c80856..4a2a2803d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.1"; + version = "1.7.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a81b00b5436e6880fa8ad6799bc830e02032047713cbb143a12939ac67eb756c"; + sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix index aeebc76270..3991dc6bf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -1,27 +1,24 @@ -{ buildPythonPackage -, fetchPypi -, pytestCheckHook -, coveralls -, pytest-cov +{ lib +, buildPythonPackage , cython +, fetchPypi , numpy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cftime"; - version = "1.5.1.1"; + version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6dc4d76ec7fe5a2d3c00dbe6604c757f1319613b75ef157554ef3648bf102a50"; + sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a"; }; - checkInputs = [ - pytestCheckHook - coveralls - pytest-cov - ]; - nativeBuildInputs = [ cython numpy @@ -31,11 +28,22 @@ buildPythonPackage rec { numpy ]; - # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft... - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - meta = { + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "cftime" + ]; + + meta = with lib; { description = "Time-handling functionality from netcdf4-python"; + homepage = "https://github.com/Unidata/cftime"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index 43767cb1a3..07259d5e59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -61,7 +61,8 @@ buildPythonPackage rec { postPatch = '' sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ - --replace 'typing==3.6.4' 'typing' + --replace "typing==3.6.4" "typing" \ + --replace "attrs>=19.3.0,<21.3.0" "attrs" ''; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index f026f39ccf..479063d306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk="; + sha256 = "sha256-i2JrV9FEQyAzjdQUJb/b9MnET5h4ISTkcwc3n9poqtI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index abe8594626..b6bfc86e24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.11508"; + version = "9.1.11611"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8="; + hash = "sha256-0yuPY90YEgQvtcmQDPqCpBmKf4ZryJocwMr0O1upiS4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 60df070768..31be98f459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "2021.11.30"; + version = "2022.1.22"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a"; + sha256 = "21a128e9f4f10e3b39cf82b36266eae28b17d16f2f6aa351bd73eb361e49326a"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 7df195b3aa..19c64fb5c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -1,12 +1,22 @@ -{ lib, jdk8, buildPythonPackage, fetchPypi, six, py4j }: +{ lib +, jdk8 +, buildPythonPackage +, fetchPypi +, six +, py4j +, pythonOlder +}: buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.5"; + version = "9.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "26b88b1d8fdacf5226cf9c1924fae974c955ccbfe2fdcd08574327007bdcbdd9"; + sha256 = "2d4712b190c9df3459432af8c16f7b9c33ebc3394c1f9811a70717b530467a41"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index e43f7d7f2d..a7ee6597b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -1,32 +1,51 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, requests, urllib3, mock, setuptools, stone }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, urllib3 +, mock +, setuptools +, stone +, pythonOlder +}: buildPythonPackage rec { pname = "dropbox"; - version = "11.25.0"; + version = "11.26.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj"; + sha256 = "0ncx41jg2wbsklqkrh0zjwjs3kfkscz8d6gcbsxqa1qpa3pa5519"; }; + propagatedBuildInputs = [ + requests + urllib3 + mock + setuptools + stone + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; - # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - pythonImportsCheck = [ "dropbox" ]; + pythonImportsCheck = [ + "dropbox" + ]; meta = with lib; { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = "https://www.dropbox.com/developers/core/docs"; + description = "Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = "https://github.com/dropbox/dropbox-sdk-python"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix index d1325f6f0e..73ede85fb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix @@ -1,31 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }: +{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoint2"; - version = "0.2.4"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "4770c3afcf3865c606a6e5f7cfcc5c59212f555fcee9b2540270399149c1dde3"; + sha256 = "sha256-Z+kG9q2VjYP0i07ewo192CZw6SYZiPa0prY6vJ+zvlY="; }; - propagatedBuildInputs = [ ]; - pythonImportsCheck = [ "entrypoint2" ]; - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; - - checkInputs = [ EasyProcess pathpy pytest ]; - - # 0.2.1 has incompatible pycache files included - # https://github.com/ponty/entrypoint2/issues/8 - checkPhase = '' - rm -rf tests/__pycache__ - pytest tests - ''; + checkInputs = [ EasyProcess pathpy pytestCheckHook ]; meta = with lib; { description = "Easy to use command-line interface for python modules"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index eff55de1d9..451a993c22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -2,7 +2,8 @@ , aioredis , async_generator , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , hypothesis , lupa , pytest-asyncio @@ -19,11 +20,13 @@ buildPythonPackage rec { version = "1.7.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; + src = fetchFromGitHub { + owner = "jamesls"; + repo = pname; + rev = version; + hash = "sha256-P6PUg9SY0Qshlvj+iV1xdrzVLJ9JXUV4cGHUynKO3m0="; }; propagatedBuildInputs = [ @@ -42,6 +45,15 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + # Support for redis <= 4.1.0, https://github.com/jamesls/fakeredis/pull/324 + (fetchpatch { + name = "support-redis-4.1.0.patch"; + url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; + sha256 = "sha256-4DrF/5WEWQWlJZtAi4qobMDyRAAcO/weHIaK9waN00k="; + }) + ]; + disabledTestPaths = [ # AttributeError: 'AsyncGenerator' object has no attribute XXXX "test/test_aioredis2.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 0834b5fa22..d49c965c86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.11"; + version = "0.28.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-6EBHFqfCCDKMY9T8suPDIOoiA2LugMJh0OJiHoICioU="; + sha256 = "1brh2wmv29vsvnndsjf1nbh2brwrkxicwcyj9brs9kgsrhvlv71s"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix index 501b95f81f..e9e445f11c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix @@ -1,32 +1,45 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, freezegun +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "5.0.2"; pname = "ftputil"; + version = "5.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "afa2ba402235e8c6583c1d2630269628344134c9246b961ff14f182047f3e633"; + hash = "sha256-m4buZ8GYDOHYmxN1K8SLlJP+4GNJy0doKFlOduCPhIg="; }; - checkInputs = [ pytest freezegun ]; + checkInputs = [ + freezegun + pytestCheckHook + ]; - checkPhase = '' - touch Makefile - # Disable tests that require network access or access /home or assume execution before year 2020 - py.test test \ - -k "not test_public_servers and not test_real_ftp \ - and not test_set_parser and not test_repr \ - and not test_conditional_upload and not test_conditional_download_with_older_target \ - '' - # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed - + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse" - + ''"''; + disabledTests = [ + # Tests require network access + "test_public_servers" + "test_real_ftp" + "test_set_parser" + "test_upload" + ]; + + pythonImportsCheck = [ + "ftputil" + ]; meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; homepage = "http://ftputil.sschwarzer.net/"; - license = licenses.bsd2; # "Modified BSD license, says pypi" + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index a3418e3a90..d2e3abef82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "3a757a3fafab46f28ffd2465ae06c5f87071aee1b41aee13f44255074483d480"; + sha256 = "20abce8d8d3939db243cbc0da62a73ff1a4e3b3b341f7ced0cfeb5e2c4a66621"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 58f3224e70..3f8b2c1f81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.27.0"; + version = "0.27.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-RPUj0We1nsKgAl1DTpa3pCD7gMm590N00+xwOVFIOaw="; + sha256 = "sha256-XBGA3wRZdl8rJ1hLLPPLK7E87Ggoly+kePbLY4x9/ZE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix index b87b59a46e..7d8dbe2efb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/halohome/default.nix @@ -9,7 +9,8 @@ buildPythonPackage rec { pname = "halohome"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "nayaverdier"; repo = pname; rev = version; - sha256 = "W7cqBJmoBUT0VvXeNKxUK0FfAuprjfvFv6rgyL2gqYQ="; + sha256 = "sha256-xnUOObqVg1E7mTDKHZMoC95KI9ZIn0YpkQjoASa5Dds="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index a0c1275806..e8ecdfff32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -10,19 +10,30 @@ , python-dateutil , websocket-client , ibm-cloud-sdk-core +, pythonOlder }: buildPythonPackage rec { pname = "ibm-watson"; - version = "5.3.0"; + version = "5.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "0g63h7rf0710bxcsr115857bvz69sl2g5d13k5a7qi7hjh33bxrk"; + sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs"; }; + propagatedBuildInputs = [ + requests + python-dateutil + websocket-client + ibm-cloud-sdk-core + ]; + checkInputs = [ responses pytestCheckHook @@ -31,18 +42,15 @@ buildPythonPackage rec { tox ]; - propagatedBuildInputs = [ - requests - python-dateutil - websocket-client - ibm-cloud-sdk-core - ]; - postPatch = '' substituteInPlace setup.py \ --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; + pythonImportsCheck = [ + "ibm_watson" + ]; + meta = with lib; { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 36b6efa724..83ff792a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-j8Vzr83pvl/AnXfA+nl5uRXf+y6ndKmQHM3bl306wFM="; + sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 83485f4252..51e3292a92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.9"; + version = "4.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vr70AB8EiOmb8lgwrq78iTnHdrp14Ppyh57Trh8SQ8Q="; + hash = "sha256-SOUOoVPrWc+NqXyBchtvtreufqSeQPJg+MgBr8n+U/Y="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index dcdc946e21..4d578a97c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.5"; + version = "0.14.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dh3uQUBEMqtlrOpnO5Aa7GC5gajwQ12rWyVPwX6xIsQ="; + sha256 = "46a87a8ee9e45e90c72e17ebb75190073e773f0890cfde7b81b0a36e15caec5d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 9ddabb97ec..9193d05906 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.75"; + version = "1.2.76"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-VIeW7RloEIBU7YNG7f2e8PdFR+FauIwKLkd7v4qRCOA="; + sha256 = "sha256-LQo7TwD91o9j/fJ5BTNV7WoCDFXnJVy1PDObH5FiNtk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index d1e0616cfb..ebd2b3f0b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -4,15 +4,19 @@ , buildPythonPackage , fetchPypi , oscrypto +, pythonOlder }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.14"; + version = "0.2.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MND7r4Gkx9RnEMgEl62QXFYr1NEloihQ2HeU9hyhsx8="; + sha256 = "20fae3cf1b329451eb3cba55d6b3c5b44501db5a23e49f47bc770e7461308672"; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { # no tests are published: https://github.com/skelsec/minikerberos/pull/5 doCheck = false; - pythonImportsCheck = [ "minikerberos" ]; + pythonImportsCheck = [ + "minikerberos" + ]; meta = with lib; { description = "Kerberos manipulation library in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix new file mode 100644 index 0000000000..fa094404b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nkdfu/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: + +buildPythonPackage rec { + pname = "nkdfu"; + version = "0.1"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + }; + + propagatedBuildInputs = [ + fire + tqdm + intelhex + libusb1 + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "nkdfu" ]; + + meta = with lib; { + description = "Python tool for Nitrokeys' firmware update"; + homepage = "https://github.com/Nitrokey/nkdfu"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ frogamic ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix index fb48f9141e..5926848b5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -7,7 +7,7 @@ , parameterized , pillow , scipy -, tensorflow-tensorboard_2 ? null +, tensorflow-tensorboard }: buildPythonPackage rec { @@ -21,14 +21,19 @@ buildPythonPackage rec { sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; }; + # Avoid propagating the dependency on `jaxlib`, see + # https://github.com/NixOS/nixpkgs/issues/156767 + buildInputs = [ + jaxlib + ]; + propagatedBuildInputs = [ jax - jaxlib numpy parameterized pillow scipy - tensorflow-tensorboard_2 + tensorflow-tensorboard ]; pythonImportsCheck = [ @@ -40,7 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/google/objax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; - # Darwin doesn't have `tensorflow-tensorboard_2` which is required by wheel deps. - platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index a6c9b150ea..e3dcfafb95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.2.0"; + version = "13.3.0"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-mVPKcxTKoRgttwJdsY7r0kF7W1+G45iCc+mFctDipSM="; + sha256 = "sha256-8QOxHka2kl/keYbsP1zOZ8hrZ+15ZGJaw91F+cpWvcA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 223cf80604..8c922413ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "12qkbaw1gyqhs6qwyj65g6l8v5xxnilwgk0gxlwnlzrr82q458ia"; + sha256 = "sha256-y1ewaVwCcJGACwupGoh7zcKxE9qVXRjMf7k3q/hFhDE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index f52467f3e5..ca81335491 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.3.1"; + version = "4.4.0"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-u/NDDJGCcctWL3ivxtU+8CSlQH+5qkmXUcF4RkQOiPI="; + hash = "sha256-AfHqKcb+ejEmY53irbIv9+1fPEczMgd7/VaFt01cNUs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 40a4bf497f..6464b376d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -8,18 +8,21 @@ , pytest-vcr , pytest-asyncio , requests -, six +, pythonOlder }: buildPythonPackage rec { pname = "pubnub"; - version = "5.5.0"; + version = "6.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh"; + hash = "sha256-ktwPut4FBkPMukUk00I1xNOuTvSJkbskPOjoYDJN5Eg="; }; propagatedBuildInputs = [ @@ -27,22 +30,24 @@ buildPythonPackage rec { cbor2 pycryptodomex requests - six ]; checkInputs = [ pytest-asyncio - pytestCheckHook pytest-vcr + pytestCheckHook ]; - # Some tests don't pass with recent releases of twisted disabledTestPaths = [ + # Tests require network access "tests/integrational" - "tests/manual/asyncio" + "tests/manual" + "tests/functional/push" ]; - pythonImportsCheck = [ "pubnub" ]; + pythonImportsCheck = [ + "pubnub" + ]; meta = with lib; { description = "Python-based APIs for PubNub"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix index 878e36e5c0..90bd83f85d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.3"; + version = "3.4"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; + sha256 = "0agis9jh6kjf7k1vf1fiyf5h3lb9p0w9k710wwpsby292ydazr4f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index 44c33a2d2e..fe418be71a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "85"; + version = "86"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-6GTMG3BfHcfLMoyabFbhsJFVDHmEICuzf32603+jyZ4="; + sha256 = "sha256-NqNXbF5rGMCbugzZY+AQPPHYmQx/RrSwqtnoF1shSSU="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pydeconz" ]; + pythonImportsCheck = [ + "pydeconz" + ]; meta = with lib; { description = "Python library wrapping the Deconz REST API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix index dc390120f6..f846127169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeight/default.nix @@ -3,19 +3,21 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "pyeight"; - version = "0.1.9"; - disabled = !isPy3k; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1ybhs09wyzzaryghd6ijxhajp3677x63c4qzqsgln1mmxhj8wm5k"; + sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI="; }; propagatedBuildInputs = [ @@ -23,9 +25,12 @@ buildPythonPackage rec { async-timeout ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "pyeight" ]; + + pythonImportsCheck = [ + "pyeight" + ]; meta = with lib; { description = "Python library to interface with the Eight Sleep API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykrakenapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykrakenapi/default.nix index 6c91b0c95d..41efa9a54d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykrakenapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pykrakenapi"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dominiktraxl"; repo = "pykrakenapi"; rev = "v${version}"; - sha256 = "0yvhgk5wyklwqd67hfajnd7ims79h4h89pp65xb3x5mcmdcfz4ss"; + hash = "sha256-i2r6t+JcL6INI8Y26gvVvNjv6XxMj4G+pF9Xf/hsx1A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix index 56e93af84a..8f2ed70835 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pylaunches"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "16fh901qlcxwycq6gqgqn076dybjnj432hb596i28avaplml4qzx"; + sha256 = "1b41j384lqg3gc7dsmdzp7anrsymqgc1895lc5j8g43x2mfgbjnh"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index 77ca912db6..9b19c4c8a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pypugjs"; - version = "5.9.9"; + version = "5.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0s0a239940z6rsssa13yz6pfkjk4300j35hs7qysyz45f3ixq19j"; + sha256 = "082dae87d44e184030b66da9ea9bd1a0209f86c089d8f2bd61064b97a7511a28"; }; propagatedBuildInputs = [ six chardet ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 3b98b57388..f6b8497232 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -13,6 +13,7 @@ , withMultimedia ? false , withWebKit ? false , withWebSockets ? false +, withLocation ? false }: let @@ -59,6 +60,7 @@ in buildPythonPackage rec { ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets + ++ lib.optional withLocation qtlocation ; buildInputs = with libsForQt5; [ @@ -71,6 +73,7 @@ in buildPythonPackage rec { ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets + ++ lib.optional withLocation qtlocation ; propagatedBuildInputs = [ @@ -107,6 +110,7 @@ in buildPythonPackage rec { ++ lib.optional withWebKit "PyQt5.QtWebKit" ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ++ lib.optional withLocation "PyQt5.QtPositioning" ; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix index 17dbd579e8..760e86f6ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ="; + hash = "sha256-DY0QGHD7HdLnKnbPV17UZl9u3Ac9YZdYvQXLOzmRGos="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 7b8aef7ec3..b7558bc631 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.11508"; + version = "9.1.11611"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME="; + hash = "sha256-HLnylnRBpPdGJKmhVYFEnvK2nJew0yfNDZyU5ly7xiw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix index 29fffb1473..ea5325ea66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.21.0"; + version = "0.22.0"; checkInputs = [ pytestCheckHook ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZsPKvbaZ7BBZuOmzq12ism/HyWYcLlQHgZaTzmIsMq4="; + sha256 = "685a08247b561ed1c7a7b42e68293f90b412e83556626304a3f826a15be51308"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 18e9e9e6c1..50d29c1923 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2021.10.0"; + version = "2022.01.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-vMXDnnIQiRuyLvem1JKop6FJ0fhwR8xP0276PdZi/QI="; + sha256 = "sha256-TPiz3d1GbcIWCKRz3Hq4JU9+df/Fw4dUXQkIM6QO1Fs="; }; nativeBuildInputs = [ @@ -42,7 +43,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "regenmaschine" ]; + disabledTestPaths = [ + # Examples are prefix with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "regenmaschine" + ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index e1ee42b081..9f102c5c92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -2,6 +2,7 @@ , aiohttp , aresponses , buildPythonPackage +, cachetools , fetchFromGitHub , pytest-asyncio , pytestCheckHook @@ -12,20 +13,21 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.4"; + version = "0.12.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "sha256-vwXBYwiDQZBxEZDwLX9if6dt7tKQQOLyKL5m0q/3eUw="; + sha256 = "1pqiba4zgx7knm1k53p6w6b9a81dalqfq2agdyrz3734nhl6gx1h"; }; propagatedBuildInputs = [ aiohttp + cachetools xmltodict yarl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 1caa20b385..20da548c0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.73.0"; + version = "2.74.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6735874a29aefc1e989a132a2e24945e5b0d057d8b297a2da695cf8421a78810"; + sha256 = "14215f5077151a7f32ca048ff7fad63c977d7cdeadc93d93c8957efbe3c89ba6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix index 8f479500a1..952a00440d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schiene/default.nix @@ -1,17 +1,21 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchPypi +, pythonOlder , requests -, beautifulsoup4 }: buildPythonPackage rec { pname = "schiene"; - version = "0.23"; + version = "0.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "014aaxmk7yxyml1xgfk3zqallyb5zi04m0v7jgqjkbjqq4n4j3ck"; + sha256 = "sha256-y1gbeavZNFniRiOBbJ4Mgmb0F01HedSmpAWaeZEv0Go="; }; propagatedBuildInputs = [ @@ -19,10 +23,12 @@ buildPythonPackage rec { beautifulsoup4 ]; - # tests are not present + # Module has no tests doCheck = false; - pythonImportsCheck = [ "schiene" ]; + pythonImportsCheck = [ + "schiene" + ]; meta = with lib; { description = "Python library for interacting with Bahn.de"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 2ba415adda..4b1d79d0e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.4"; + version = "6.9.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-xNd0IPhaVw4X6URsg6hrDJhxmBRWam4bqgLN0uvMUxI="; + sha256 = "1r8xh0c6wivrajj6gl1hv25vsb9i79n19nd4x53207i5vz9d55g5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 5247850173..362b6dadd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.22"; + version = "3.22.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "24803ea4d63e2123d2040db2da43fea95fabada80e1af1fe1da69643ae376689"; + sha256 = "35ebb4f7e2b09f1818b36e7da6dc62f1ca57e2c0d99a9cbc8151e634d75a7906"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 59585ddc3f..c332a067a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.2"; + version = "6.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193"; + sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; }; # Tells the tests which database to use diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index c1d4328106..d8398ac402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.65"; + version = "0.0.66"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-3Lcmc95KotFMlL44zDugIQkHtplMMlyWjSb+SLehaqs="; + sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index ab6cbbeba5..ef92148a31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.762"; + version = "2.0.763"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-7YINKTvEAAOGoGkc4t2YwuMBF4rvOxRD2XhJxJBWvis="; + hash = "sha256-KqxFFRKOCDzlGVKYMp3YNWMKGdxXT9f6xwaCc5XIruk="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix deleted file mode 100644 index ec03e28560..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps -}: - -with lib; - -assert stdenv ? cc; -assert stdenv.cc ? libc; - -let - os = lib.optionalString; - majorVersion = "2.8"; - minorVersion = "12.2"; - version = "${majorVersion}.${minorVersion}"; -in - -stdenv.mkDerivation rec { - pname = "cmake${os useNcurses "-cursesUI"}${os useQt4 "-qt4UI"}"; - inherit version; - - inherit majorVersion; - - src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; - }; - - enableParallelBuilding = true; - - patches = - [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 - name = "FindFreetype-2.5.patch"; - url = "https://public.kitware.com/Bug/file/4660/0001-Support-finding-freetype2-using-pkg-config.patch"; - sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; - })] ++ - # Don't search in non-Nix locations such as /usr, but do search in our libc. - [ ./search-path-2.8.patch ] ++ - optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "https://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); - - postPatch = '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - - buildInputs = [ setupHook curl expat zlib bzip2 ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4; - - propagatedBuildInputs = [ ps ]; - - CMAKE_PREFIX_PATH = concatStringsSep ":" - (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); - - configureFlags = [ - "--docdir=/share/doc/${pname}-${version}" - "--mandir=/share/man" - "--system-libs" - "--no-system-libarchive" - ] ++ lib.optional useQt4 "--qt-gui"; - - setupHook = ./setup-hook.sh; - - dontUseCmakeConfigure = true; - - preConfigure = with stdenv; '' - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${getBin cc.libc} \ - --subst-var-by libc_dev ${getDev cc.libc} \ - --subst-var-by libc_lib ${getLib cc.libc} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" - ''; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://cmake.org"; - description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix; - maintainers = with lib.maintainers; [ xfix ]; - license = lib.licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch deleted file mode 100644 index 9fc9496616..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake ---- cmake-2.8.12.2/Modules/Platform/Linux.cmake 2014-01-16 21:15:08.000000000 +0400 -+++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake 2016-04-13 22:00:32.928575740 +0300 -@@ -36,22 +36,11 @@ - # checking the platform every time. This option is advanced enough - # that only package maintainers should need to adjust it. They are - # capable of providing a setting on the command line. -- if(EXISTS "/etc/debian_version") -- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -- "Install .so files without execute permission.") -- else() -- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -- "Install .so files without execute permission.") -- endif() -+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -+ "Install .so files without execute permission.") - endif() - - # Match multiarch library directory names. - set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") - - include(Platform/UnixPaths) -- --# Debian has lib64 paths only for compatibility so they should not be --# searched. --if(EXISTS "/etc/debian_version") -- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) --endif() -diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake 2014-01-16 21:15:08.000000000 +0400 -+++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:09:10.106362636 +0300 -@@ -32,9 +32,6 @@ - # List common installation prefixes. These will be used for all - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- /usr/local /usr / -- - # CMake install location - "${_CMAKE_INSTALL_DIR}" - -@@ -44,44 +41,26 @@ - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @libc_dev@/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @libc_bin@/bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - - # Enable use of lib64 search path variants by default. diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 4dcaa7c432..f312b522ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-BzO7S2sxZeklzIh1qRHJ4mGLsKLNpg8PuGGRVAkPlzc="; + hash = "sha256-Cg85NdbbZs0tkBy2kq5ZRKDuQwLIixdhggOBSFpUM04="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index b7b8e3ed3b..e5fdce7cf2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -80,14 +80,14 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.7" { - armv7l-linux = "13acf496801d2a311f9c0644d086df26976259e915cb2201fd29665d8122a98b"; - aarch64-linux = "8d751e9e998f5eece15dba8cae1a7aa4b780da1b802235bafcd86a3540f4efe2"; - x86_64-linux = "af93b62e197a40c648c964d44939d24fc56ff4fa8ccac22cfb020660c726f4e7"; - i686-linux = "68085a6849aa571fea7682b66207abd2b6adb0a515195a00862776f37f2ff3f0"; - x86_64-darwin = "70d51ac6adc50df3195af022e700d3d10056c9e1fb770c79540215cdee9d67b3"; - aarch64-darwin = "4d9facf75a94f6d053c02db97ca4012833274b3d3f9ab0438733a302d4a28f60"; - headers = "1ydyl2s58vf65ywih2n3iam8l6yggmsn6hv0jhwp1rsash8hl4x4"; + electron_13 = mkElectron "13.6.8" { + armv7l-linux = "94cf65f1454ea26017d80cd98a9fd3d9c9767d2a2ba7030d29d674d643814d59"; + aarch64-linux = "5579b20438e5637f0ec8e0f07a46d5359691bfd631290372d538217c1904e07b"; + x86_64-linux = "054f2a83a1361ea25438b609a681adb8c8dec8a2f03fd5b3605b10818799ea01"; + i686-linux = "87cb2af357ba568fb56c99aea0a25714501fbacd02ce27c9ba55e3db8deb5535"; + x86_64-darwin = "d8fa0254c4a5fe61f5a047f9cb6968a2dbc817cbd10cac1fd9c9d362608bc58d"; + aarch64-darwin = "8e59ea97744791f7edaf3ff4c2fa1a144f9737c165c29ee0f0d13175a2140399"; + headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x"; }; electron_14 = mkElectron "14.2.4" { diff --git a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix index ce3420fd91..4e96294fe3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix @@ -47,13 +47,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.2.0"; + version = "1.2.2"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-38tqPKONYeB3W3CkaatQUoXhKTYUYt8JAE5tQlHCRqg="; + sha256 = "sha256-if2mjlN8Hp3gI1JpC9icMhenKRZFWNNfNbCPea2E4D4="; }; patches = [ @@ -87,10 +87,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - # TODO: Remove older versions. - # https://github.com/flatpak/flatpak-builder/pull/437 - docbook_xml_dtd_412 - docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl gettext diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix index 0a0eb41d61..5bd02fb27d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; - rev = "df209afeed2334a97c83aff34ea7abcad85c31f6"; + rev = "v${version}"; sha256 = "17pmcfkcmgjvs4drs0fyhp2m39gw83s0ck3rdzdkgdhrbhva9ksx"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index f18d09bf7d..5671f5dbe6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -72,6 +72,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin globin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix index f88fcd9f42..0163b616f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zl0OuyqF+bNsp1AqnS8jhQlY7l4U6OjHHgth7pRPwEc="; + sha256 = "sha256-Ekwucff12FIjaZ8qDvonhTdz7+DRpPLMGz2yqaCy+Bc="; }; vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index ac5600519b..1688e92c84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }: +{ fetchFromGitHub, callPackage, nixVersions, nixosTests }: { hydra-unstable = callPackage ./common.nix { @@ -9,7 +9,7 @@ rev = "9bce425c3304173548d8e822029644bb51d35263"; sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; - nix = nixUnstable; + nix = nixVersions.unstable; tests = { basic = nixosTests.hydra.hydra-unstable; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix index aa49af753b..95fa79c6d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/3.7.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix index c2449de5dd..58f5996992 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index d0f33d750c..a63822428b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -7,6 +7,7 @@ , xxHash , zlib , openssl +, nix-update-script }: stdenv.mkDerivation rec { @@ -29,6 +30,12 @@ stdenv.mkDerivation rec { LTO = 1; makeFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A high performance drop-in replacement for existing unix linkers"; homepage = "https://github.com/rui314/mold"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 988f767922..fe20047713 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/nvim-treesitter/tree-sitter-lua", - "rev": "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6", - "date": "2021-08-02T15:13:28+02:00", - "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", - "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", + "url": "https://github.com/MunifTanjim/tree-sitter-lua", + "rev": "2e372ad0af8c6a68ba39f107a2edc9e3fc19ecf1", + "date": "2022-01-21T16:10:07+06:00", + "path": "/nix/store/6gpfn7bvv92b6rjw40kpmgvvvzb07j26-tree-sitter-lua", + "sha256": "1vyjix2vsrxkcwm0hbcc5i81c0a552mg7x639m6zxr6wh0ca4nsm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index c0a5812d7e..eae6dd0813 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 @@ -105,7 +105,7 @@ let repo = "tree-sitter-latex"; }; "tree-sitter-lua" = { - orga = "nvim-treesitter"; + orga = "MunifTanjim"; repo = "tree-sitter-lua"; }; "tree-sitter-fennel" = { diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index a3e1762162..021ba8c7f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.72.0"; + version = "1.72.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-2Aj2Y0c8JR8s6Ek7sZfU+5RENkoCVSAxtOvkHilfb48="; + sha256 = "sha256-qFEvDslAjXpIpSanM4iorgTRfKWQPKKzxxwguFUlFZA="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-sSIQ7Wa0otbq82WELxP3oFYa1FoaoZz2jCB59Ob6zNM="; + cargoSha256 = "sha256-PRyQWohxlSNRiVj3r7xTxFVWsYL+C50bkhDU4NLaMBo="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 0c33e170f9..b2da64427c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.2.1"; - vendorSha256 = "sha256-vnevuJoDiAx/Z6uKO/SX3UV3j/jsXXNlnui6Nzm+tBA="; + version = "5.2.2"; + vendorSha256 = "sha256-/ct1DNSCB1KzajyHWe6guF5iYm5AAEbPunn7xYLw25I="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-51TkiOf3QkwuLv3l+aj5r5tgpDD/VglqeAjliCm5E5M="; + sha256 = "sha256-qTt9FxphGi8o5hc3IaQGuIN+6t3KE/9xH9dv7i+C4ec="; }; # Tests requires network access diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix index c1a069d36f..1209f371a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -1,17 +1,19 @@ { stdenv, lib, fetchurl, unzip }: let + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "4.0.60"; supportedPlatforms = { "x86_64-linux" = { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-On+Sokm2+BV3JbIwK8oPO6882FOWBlgSaAp3VAyR+RM="; + sha256 = "sha256-v5UxRMDDQxpqIKMe9mYMXcpWiacdXzFfaQ6bgab/WmQ="; }; "x86_64-darwin" = { name = "x86_64-apple-darwin"; - sha256 = "sha256-4YCm42mVcsEvY4I5MWrnbfgUIU7KUIrEirvjN8ISIr0="; + sha256 = "sha256-vFMMzMatuu1TY6dnBXycv0HxvkOj4Axfx8p0VW0hOic="; }; "aarch64-darwin" = { name = "aarch64-apple-darwin"; - sha256 = "sha256-HN4o5bGX389eAR7ea5EY1JlId8q4lSPGJ4cZo9c2aP4="; + sha256 = "sha256-DUeDQLtvSY7W2nG60UunluCSO0ijJP2CYxpRIZA4LTE="; }; }; platform = @@ -20,10 +22,9 @@ let else throw "Not supported on ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tabnine"; - # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.7.25"; + inherit version; src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; license = licenses.unfree; - platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" ]; + platforms = attrNames supportedPlatforms; maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 18533469a0..6958a7b11d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zL9Ylrl541RCSOliH+X7TfvRZyEXvISsH3N1agjoC8U="; + sha256 = "sha256-bsPwyTucFJdKp+r8uJ2XLOzvbTM4i5EmSY+3VgyAFuE="; }; - cargoSha256 = "sha256-qc32MX56/0JaHx/x/5em3SoNi6YM5nduVLrDOQbMZDg="; + cargoSha256 = "sha256-2wJXx8xHPrjzKupuen3XfRMSviYEwYK3nbL5/uTDIzE="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix index d28574637a..41c2522dd0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "zprint"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-av1DsTijNzLdnBjTF2fEFqEM/X2VUVFvNuC09ikeDGM="; + sha256 = "sha256-yC3ByAmR0btaWZQj8n9ITyOAw+wgsmSfNE0Q3QSdzqo="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 42198a65f7..fc53362314 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.9.24"; + version = "2.9.29"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4M7Oj/hHFH2OUz0y64GIEnv0Kk0+zAje3kHA2e4RQS0="; + sha256 = "sha256-lPw0ndxffBQNsJStrZ9gaGZg+EJcGT9b6xTAc7eX6c8="; }; - vendorSha256 = "sha256-oYZZ9DzpY544QTWDGz/wkHA9aP0riEXLUTWvzV1KxQc="; + vendorSha256 = "sha256-4aoDQKMhczy1u4Eq567aMrFVIBW2L8OgNCqsgmUN6CI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/games/blobby/default.upstream b/third_party/nixpkgs/pkgs/games/blobby/default.upstream deleted file mode 100644 index 8f2804e079..0000000000 --- a/third_party/nixpkgs/pkgs/games/blobby/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/ -SF_version_dir -version_link '[.]tar[.][^.]+/download$' -SF_redirect -do_overwrite(){ - do_overwrite_just_version - set_var_value url $CURRENT_URL -} diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.upstream b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.upstream deleted file mode 100644 index b6d048b68a..0000000000 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -minimize_overwrite -url http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz -redirect -NEED_TO_CHOOSE_URL= -version '.*[-_.]([0-9]{8}[.][^.]+)[.]tar[.].*' '\1' diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index b90f75f6a0..5c30040f49 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -62,6 +62,5 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; # Once had cygwin problems downloadPage = "https://www.jwz.org/xscreensaver/download.html"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 307003025c..111d5cf048 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -664,8 +664,8 @@ let mktplcRef = { name = "elm-ls-vscode"; publisher = "Elmtooling"; - version = "2.0.1"; - sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43"; + version = "2.4.0"; + sha256 = "sha256-5hYlkx8hlwS8iWTlfupX8XjTLAY/KUi0bd3jf/tm92o="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.upstream b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.upstream deleted file mode 100644 index 46099d9c95..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://atoptool.nl/downloadatop.php -version_link '[.]tar[.]' -version '[^0-9]*[-.]([0-9]([-0-9.]*[0-9])?)[.].*' '\1' -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch deleted file mode 100644 index 00c23c6cac..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: pkg-ipsec-tools/src/racoon/gssapi.c -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/gssapi.c -+++ pkg-ipsec-tools/src/racoon/gssapi.c -@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) - gss_name_t princ, canon_princ; - OM_uint32 maj_stat, min_stat; - -+ if (iph1->rmconf == NULL) { -+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); -+ return -1; -+ } -+ - gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); - if (gps == NULL) { - plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch deleted file mode 100644 index b644d46f8c..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch +++ /dev/null @@ -1,193 +0,0 @@ -From: Antoine_Beaupre -Acked-by: Jiri Bohac -Subject: PR/51682: Avoid DoS with fragment out of order insertion; keep fragments sorted in the list. -References: bsc#1047443, CVE-2016-10396 - - - -Index: a/src/racoon/handler.h -=================================================================== ---- a/src/racoon/handler.h.orig 2018-01-26 18:05:21.114764376 +0100 -+++ a/src/racoon/handler.h 2018-01-26 18:05:33.986741103 +0100 -@@ -141,6 +141,7 @@ struct ph1handle { - #endif - #ifdef ENABLE_FRAG - int frag; /* IKE phase 1 fragmentation */ -+ int frag_last_index; - struct isakmp_frag_item *frag_chain; /* Received fragments */ - #endif - -Index: a/src/racoon/isakmp.c -=================================================================== ---- a/src/racoon/isakmp.c.orig 2018-01-26 18:05:21.118764369 +0100 -+++ a/src/racoon/isakmp.c 2018-01-26 18:05:33.986741103 +0100 -@@ -1069,6 +1069,7 @@ isakmp_ph1begin_i(rmconf, remote, local) - iph1->frag = 1; - else - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -@@ -1173,6 +1174,7 @@ isakmp_ph1begin_r(msg, remote, local, et - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -Index: a/src/racoon/isakmp_frag.c -=================================================================== ---- a/src/racoon/isakmp_frag.c.orig 2018-01-26 18:05:21.118764369 +0100 -+++ a/src/racoon/isakmp_frag.c 2018-01-26 18:05:33.986741103 +0100 -@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) - return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); - } - -+static int -+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) -+{ -+ struct isakmp_frag_item *pitem = NULL; -+ struct isakmp_frag_item *citem = iph1->frag_chain; -+ -+ /* no frag yet, just insert at beginning of list */ -+ if (iph1->frag_chain == NULL) { -+ iph1->frag_chain = item; -+ return 0; -+ } -+ -+ do { -+ /* duplicate fragment number, abort (CVE-2016-10396) */ -+ if (citem->frag_num == item->frag_num) -+ return -1; -+ -+ /* need to insert before current item */ -+ if (citem->frag_num > item->frag_num) { -+ if (pitem != NULL) -+ pitem->frag_next = item; -+ else -+ /* insert at the beginning of the list */ -+ iph1->frag_chain = item; -+ item->frag_next = citem; -+ return 0; -+ } -+ -+ pitem = citem; -+ citem = citem->frag_next; -+ } while (citem != NULL); -+ -+ /* we reached the end of the list, insert */ -+ pitem->frag_next = item; -+ return 0; -+} -+ - int - isakmp_frag_extract(iph1, msg) - struct ph1handle *iph1; -@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) - item->frag_next = NULL; - item->frag_packet = buf; - -- /* Look for the last frag while inserting the new item in the chain */ -- if (item->frag_last) -- last_frag = item->frag_num; -+ /* Check for the last frag before inserting the new item in the chain */ -+ if (item->frag_last) { -+ /* if we have the last fragment, indices must match */ -+ if (iph1->frag_last_index != 0 && -+ item->frag_last != iph1->frag_last_index) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated last fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; -+ } - -- if (iph1->frag_chain == NULL) { -- iph1->frag_chain = item; -- } else { -- struct isakmp_frag_item *current; -+ last_frag = iph1->frag_last_index = item->frag_num; -+ } - -- current = iph1->frag_chain; -- while (current->frag_next) { -- if (current->frag_last) -- last_frag = item->frag_num; -- current = current->frag_next; -- } -- current->frag_next = item; -+ /* insert fragment into chain */ -+ if (isakmp_frag_insert(iph1, item) == -1) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; - } - -- /* If we saw the last frag, check if the chain is complete */ -+ /* If we saw the last frag, check if the chain is complete -+ * we have a sorted list now, so just walk through */ - if (last_frag != 0) { -+ item = iph1->frag_chain; - for (i = 1; i <= last_frag; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -+ if (item->frag_num != i) -+ break; -+ item = item->frag_next; - if (item == NULL) /* Not found */ - break; - } - -- if (item != NULL) /* It is complete */ -+ if (i > last_frag) /* It is complete */ - return 1; - } - -@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) - } - data = buf->v; - -+ item = iph1->frag_chain; - for (i = 1; i <= frag_count; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -- if (item == NULL) { -+ if (item->frag_num != i) { - plog(LLV_ERROR, LOCATION, NULL, - "Missing fragment #%d\n", i); - vfree(buf); -@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) - } - memcpy(data, item->frag_packet->v, item->frag_packet->l); - data += item->frag_packet->l; -+ item = item->frag_next; - } - - out: - - -diff -u -p -r1.50 -r1.51 ---- a/src/racoon/isakmp_inf.c 2013/04/12 09:53:10 1.50 -+++ a/src/racoon/isakmp_inf.c 2017/01/24 19:23:56 1.51 -@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix deleted file mode 100644 index f10364121a..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }: - -# TODO: These tools are supposed to work under NetBSD and FreeBSD as -# well, so I guess it's not appropriate to place this expression in -# "os-specific/linux/ipsec-tools". Since I cannot verify that the -# expression actually builds on those platforms, I'll leave it here for -# the time being. - -stdenv.mkDerivation rec { - pname = "ipsec-tools"; - version = "0.8.2"; - - src = fetchurl { - url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; - sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; - }; - - buildInputs = [ readline openssl flex libkrb5 pam ]; - - patches = [ - ./dont-create-localstatedir-during-install.patch - ./CVE-2015-4047.patch - ./CVE-2016-10396.patch - ]; - - # fix build with newer gcc versions - preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; - - configureFlags = [ - "--sysconfdir=/etc --localstatedir=/var" - "--with-kernel-headers=${linuxHeaders}/include" - "--disable-security-context" - "--enable-adminport" - "--enable-dpd" - "--enable-frag" - "--enable-gssapi" - "--enable-hybrid" - "--enable-natt" - "--enable-shared" - "--enable-stats" - ]; - - meta = with lib; { - homepage = "http://ipsec-tools.sourceforge.net/"; - description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch deleted file mode 100644 index 16b80c36d6..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ubr ipsec-tools-0.8.0-orig/src/racoon/Makefile.in ipsec-tools-0.8.0/src/racoon/Makefile.in ---- ipsec-tools-0.8.0-orig/src/racoon/Makefile.in 2012-10-20 13:01:07.700903316 +0200 -+++ ipsec-tools-0.8.0/src/racoon/Makefile.in 2012-10-20 13:01:13.177832616 +0200 -@@ -1085,9 +1085,6 @@ - uninstall-sbinPROGRAMS - - --install-exec-local: -- ${mkinstalldirs} $(DESTDIR)${adminsockdir} -- - # special object rules - crypto_openssl_test.o: crypto_openssl.c - $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix index 50730597d9..c6dc10f32b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2; downloadPage = "https://www.netfilter.org/projects/iptables/files/"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 9d90c0cf02..43bc291ede 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,31 +22,31 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.92-hardened1.patch", - "sha256": "08vhk7vzwd9r76mphyphc5n718kdpg3l2i0smrr92w5mx19pvs8g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.92-hardened1/linux-hardened-5.10.92-hardened1.patch" + "name": "linux-hardened-5.10.93-hardened1.patch", + "sha256": "0ka3vnd1pwdjkz10hpn4jpxbg6s00kf5jj47847vhbi7fmbgvbg5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.93-hardened1/linux-hardened-5.10.93-hardened1.patch" }, - "sha256": "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm", - "version": "5.10.92" + "sha256": "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56", + "version": "5.10.93" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.15-hardened1.patch", - "sha256": "0js9fz2xx8gshxb5dc6ycmgycmcfqpxdkbpbmx92d397qdnj0460", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.15-hardened1/linux-hardened-5.15.15-hardened1.patch" + "name": "linux-hardened-5.15.16-hardened1.patch", + "sha256": "0a8cdxw2s0jr39j072pn7xr5j8zfdmrbsfl5rbvcjqrfnj4ijc15", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.16-hardened1/linux-hardened-5.15.16-hardened1.patch" }, - "sha256": "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x", - "version": "5.15.15" + "sha256": "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms", + "version": "5.15.16" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.172-hardened1.patch", - "sha256": "124l2b3km1278dc4lgm35f50jfxnbdia1127j27w3b3dhs37baw9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.172-hardened1/linux-hardened-5.4.172-hardened1.patch" + "name": "linux-hardened-5.4.173-hardened1.patch", + "sha256": "1zpczgxyh76lazsjgf7n1872aayaxg660x6phyr6db667wa8x3r4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.173-hardened1/linux-hardened-5.4.173-hardened1.patch" }, - "sha256": "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi", - "version": "5.4.172" + "sha256": "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r", + "version": "5.4.173" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index bf36ad5216..7b9013fbaf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.262"; + version = "4.14.263"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac"; + sha256 = "0bn17p1mmkc37bqv7bvksli4xpyp660mbcjm6jmh6k348i1bfwqf"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5953b9ff22..98cc139273 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.225"; + version = "4.19.226"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb"; + sha256 = "1b9qvl994n09708sql3q3g5l3xq2hxam83fnws5asd8mdnk7i7wk"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 1addff89c2..d2de100ad3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.299"; + version = "4.4.300"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "019hmplv1zhghl840qky9awziba3gx7jm80khny44gjfbyzf7d4v"; + sha256 = "19mpqg48yi7qm1a2mncqax7pj42accryj6yrkbywd7kj4q0b64kg"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 81f576616f..70457c1b3b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.297"; + version = "4.9.298"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17yqnr6p0prgcw8nikjmi49ll4s77ylaixcja5m15cq9x36shfz4"; + sha256 = "0nrhjqn6bfp9h5dc7yacgkbfvfdhlks8ph4dzqyfjljmx9cf95ym"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 41a48908ff..90bd4dc2ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.93"; + version = "5.10.94"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56"; + sha256 = "023mrm8wjmxi6qp21p1d0kzs8k0pls6l8kp75ajix2ls9am49zr8"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 607521af13..336ee4149a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.16"; + version = "5.15.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms"; + sha256 = "1pmbf3xin533z4jpqj8p733ii5zk0k36v4cpzl14k62rrk0gb1r7"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix index be238fb9ed..096c48c008 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.2"; + version = "5.16.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0i1vcv2zi80ixmgjdcq6yk8qhwaqlbbmmrq0prxk41339lx87zh9"; + sha256 = "1cdmp7k6qfm8gyr8zv589y6bgmyj7n6wyk36f98m0w2vq3ljyh5s"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index bdfa568ba2..fd47f8c0ec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.173"; + version = "5.4.174"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r"; + sha256 = "1a88hfcskrcbz7gyh8pkcymka4djdhdy6fdh4i0b9ygsmvjipkg8"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index 02e3902d3c..0d56108f2f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.18"; - suffix = "lqx1"; + version = "5.15.16"; + suffix = "lqx2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-jn2Y/zusxwOvT5MXlM5HCojiyY0ssC36O92iv7/ZMWU="; + sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg="; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index ec83b47208..3b4ed64bda 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -17,7 +17,7 @@ }@args: { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl -, kernel ? null, perl, nukeReferences +, kernel ? null, perl, nukeReferences, which , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -93,6 +93,7 @@ let libPath = libPathFor pkgs; libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); + buildInputs = [ which ]; nativeBuildInputs = [ perl nukeReferences ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index d158388688..22602d12bd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-qKd6CwjiznoA97G4cnIt4FpVaLQMJYBt3JD2l7h72Z4="; + sha256 = "sha256-m0ArsN9xopfBPnHTiPDEOPuhQHQ2zoICGwVM7P05k3U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.upstream b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.upstream deleted file mode 100644 index 485de5741d..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url https://github.com/draios/sysdig/releases -ensure_choice -version '.*/([0-9.]+)[.]tar[.].*' '\1' -do_overwrite () { - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value version $CURRENT_VERSION -} diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index 356b21d354..d0b11d9b7c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file +, fetchpatch , openssl , enableDbi ? false, libdbi , enableMagnet ? false, lua5_1 @@ -9,23 +10,22 @@ , enableWebDAV ? false, sqlite, libuuid , enableExtendedAttrs ? false, attr , perl -, fetchpatch }: stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.63"; + version = "1.4.64"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "1fgasvif13gvzz4rf5mjpy28cbw9fs4ymhx18494mxgb080pzvra"; + sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY="; }; patches = [ (fetchpatch { - name = "CVE-2022-22707.patch"; - url = "https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664.patch"; - sha256 = "0zm2khgllsd1ivh9m7sisfsyrdfz45zsmiwl963wf0gn8m100gzk"; + name = "macos-10.12-avoid-ccrandomgeneratebytes.patch"; + url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff"; + sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs"; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] + buildInputs = [ pcre2 pcre2.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableExtendedAttrs "--with-attr"; preConfigure = '' - export PATH=$PATH:${pcre.dev}/bin + export PATH=$PATH:${pcre2.dev}/bin sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.upstream b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.upstream deleted file mode 100644 index 7bb0254995..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]+([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 4860dd9a93..a15e882dea 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, pkgs }: +{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }: let @@ -33,6 +33,29 @@ in inputs = [ pkgs.openssl ]; }; + auth-a2aclr = { + src = fetchFromGitLab { + name = "auth-a2aclr"; + owner = "arpa2"; + repo = "nginx-auth-a2aclr"; + rev = "bbabf9480bb2b40ac581551883a18dfa6522dd63"; + sha256 = "sha256-h2LgMhreCgod+H/bNQzY9BvqG9ezkwikwWB3T6gHH04="; + }; + inputs = [ + (pkgs.arpa2common.overrideAttrs + (old: rec { + version = "0.7.1"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "arpa2common"; + rev = "v${version}"; + sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64="; + }; + })) + ]; + }; + aws-auth = { src = fetchFromGitHub { name = "aws-auth"; @@ -50,20 +73,21 @@ in repo = "ngx_brotli"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; - }; in pkgs.runCommand "ngx_brotli-src" {} '' - cp -a ${gitsrc} $out - substituteInPlace $out/filter/config \ - --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} - ''; + }; in + pkgs.runCommand "ngx_brotli-src" { } '' + cp -a ${gitsrc} $out + substituteInPlace $out/filter/config \ + --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} + ''; inputs = [ pkgs.brotli ]; }; cache-purge = { src = fetchFromGitHub { name = "cache-purge"; - owner = "nginx-modules"; - repo = "ngx_cache_purge"; - rev = "2.5.1"; + owner = "nginx-modules"; + repo = "ngx_cache_purge"; + rev = "2.5.1"; sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd"; }; }; @@ -71,9 +95,9 @@ in coolkit = { src = fetchFromGitHub { name = "coolkit"; - owner = "FRiCKLE"; - repo = "ngx_coolkit"; - rev = "0.2"; + owner = "FRiCKLE"; + repo = "ngx_coolkit"; + rev = "0.2"; sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh"; }; }; @@ -141,13 +165,14 @@ in }; ipscrub = { - src = fetchFromGitHub { - name = "ipscrub"; - owner = "masonicboom"; - repo = "ipscrub"; - rev = "v1.0.1"; - sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; - } + "/ipscrub"; + src = fetchFromGitHub + { + name = "ipscrub"; + owner = "masonicboom"; + repo = "ipscrub"; + rev = "v1.0.1"; + sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; + } + "/ipscrub"; inputs = [ pkgs.libbsd ]; }; @@ -161,7 +186,7 @@ in }; }; - live ={ + live = { src = fetchFromGitHub { name = "live"; owner = "arut"; @@ -228,7 +253,7 @@ in }; }; - mpeg-ts ={ + mpeg-ts = { src = fetchFromGitHub { name = "mpeg-ts"; owner = "arut"; @@ -238,14 +263,15 @@ in }; }; - naxsi ={ - src = fetchFromGitHub { - name = "naxsi"; - owner = "nbs-system"; - repo = "naxsi"; - rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; - sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; - } + "/naxsi_src"; + naxsi = { + src = fetchFromGitHub + { + name = "naxsi"; + owner = "nbs-system"; + repo = "naxsi"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; + } + "/naxsi_src"; }; opentracing = { @@ -266,10 +292,10 @@ in version = pkgs.psol.version; moduleSrc = fetchFromGitHub { - name = "pagespeed"; - owner = "pagespeed"; - repo = "ngx_pagespeed"; - rev = "v${version}-stable"; + name = "pagespeed"; + owner = "pagespeed"; + repo = "ngx_pagespeed"; + rev = "v${version}-stable"; sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp"; }; @@ -278,8 +304,8 @@ in { meta = { description = "PageSpeed module for Nginx"; - homepage = "https://developers.google.com/speed/pagespeed/module/"; - license = pkgs.lib.licenses.asl20; + homepage = "https://developers.google.com/speed/pagespeed/module/"; + license = pkgs.lib.licenses.asl20; }; } '' @@ -287,7 +313,8 @@ in chmod -R +w "$out" ln -s "${pkgs.psol}" "$out/psol" ''; - in { + in + { src = ngx_pagespeed; inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps allowMemoryWriteExecute = true; @@ -314,7 +341,7 @@ in }; }; - push-stream ={ + push-stream = { src = fetchFromGitHub { name = "push-stream"; owner = "wandenberg"; @@ -378,9 +405,9 @@ in slowfs-cache = { src = fetchFromGitHub { name = "slowfs-cache"; - owner = "FRiCKLE"; - repo = "ngx_slowfs_cache"; - rev = "1.10"; + owner = "FRiCKLE"; + repo = "ngx_slowfs_cache"; + rev = "1.10"; sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr"; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/stable.upstream b/third_party/nixpkgs/pkgs/servers/http/nginx/stable.upstream deleted file mode 100644 index c201390174..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/stable.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index 92fe6e0403..064d138d39 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "1g5ii5vvcr87qkabsbyg3n7kzy1g5k2n5gwa8468w5d0ava424hg"; + hash = "sha256-jeBhnc8vp8IVqAz4S4KrcWMdTUciy6CUlyXOPhgDHU4="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix index 4d439bf760..196cd07cef 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix @@ -61,13 +61,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.66"; + version = "6.2.68"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "sha256-rD6sYsEsAyu+4Vy2wMtWCtlzXoLeZgeu9hkoxOvwiP4="; + sha256 = "sha256-biTF2We9/ZBFBNpltyJonAe5tpXz+eNam+Bu6esJPiY="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix index c55c67f5f6..c4e2cc5329 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -63,6 +63,7 @@ perlPackages.buildPerlPackage rec { cp -r bin $out cp -r lib $out + cp -r share $out for cur in $out/bin/*; do if [ -x "$cur" ]; then diff --git a/third_party/nixpkgs/pkgs/servers/softether/4.25.nix b/third_party/nixpkgs/pkgs/servers/softether/4.25.nix deleted file mode 100644 index f22bd0859a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/softether/4.25.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl -, openssl, readline, ncurses, zlib -, dataDir ? "/var/lib/softether" }: - -let - os = if stdenv.isLinux then "1" - else if stdenv.isFreeBSD then "2" - else if stdenv.isSunOS then "3" - else if stdenv.isDarwin then "4" - else if stdenv.isOpenBSD then "5" - else ""; - cpuBits = if stdenv.is64bit then "2" else "1"; - -in - -stdenv.mkDerivation rec { - pname = "softether"; - version = "4.25"; - build = "9656"; - compiledDate = "2018.01.15"; - - src = fetchurl { - url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; - sha256 = "1y1m8lf0xfh7m70d15wj2jjf5a5qhi3j49ciwqmsscsqvb1xwimr"; - }; - - buildInputs = [ openssl readline ncurses zlib ]; - - preConfigure = '' - echo "${os} - ${cpuBits} - " | ./configure - rm configure - ''; - - buildPhase = '' - mkdir -p $out/bin - sed -i \ - -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ - -e "/_DIR=/s|/usr|${dataDir}|g" \ - -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ - -e "/echo/s|echo $out/|echo |g" \ - Makefile - ''; - - meta = with lib; { - description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = "https://www.softether.org/"; - license = licenses.gpl2; - maintainers = [ maintainers.rick68 ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/sshportal/default.nix b/third_party/nixpkgs/pkgs/servers/sshportal/default.nix new file mode 100644 index 0000000000..73aec946fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sshportal/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "sshportal"; + version = "1.18.5"; + + src = fetchFromGitHub { + owner = "moul"; + repo = "sshportal"; + rev = "v${version}"; + sha256 = "1d9zws7b6ng23vyk8di5jmnbsxz7kaj4z8wz43wkwr6b65c2h0bf"; + }; + + ldflags = [ "-X main.GitTag=${version}" "-X main.GitSha=${version}" "-s" "-w" ]; + + vendorSha256 = "0fnn455adw4bhz68dpqaii08wv7lifdd5kx95rpqxsi2sqrzr4br"; + + meta = with lib; { + description = "Simple, fun and transparent SSH (and telnet) bastion server"; + homepage = "https://manfred.life/sshportal"; + license = licenses.asl20; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index ba3c8eef20..7a70accb72 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -236,7 +236,6 @@ let name = str; version = str; tag = str; - updateWalker = bool; executables = listOf str; outputsToInstall = listOf str; position = str; @@ -244,7 +243,6 @@ let repositories = attrsOf str; isBuildPythonPackage = platforms; schedulingPriority = int; - downloadURLRegexp = str; isFcitxEngine = bool; isIbusEngine = bool; isGutenprint = bool; diff --git a/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix index 036ba8bc4e..61a80bcbcd 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; all; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 78aaa355d6..330722898c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -135,7 +135,6 @@ in buildPythonApplication rec { meta = { homepage = "https://xpra.org/"; downloadPage = "https://xpra.org/src/"; - downloadURLRegexp = "xpra-.*[.]tar[.][gx]z$"; description = "Persistent remote applications for X"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix index e95475be33..f7ba90ac2a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-WY8SYapnDcfaoLr1iFgwc9/E7xSfOFN2AvMDpk74AI8="; + sha256 = "sha256-5UU8iBzwO7xM8B+LulnFkJFv5j5lu7mfq0XMmOCaKcQ="; }; - cargoSha256 = "sha256-ZNSg3hXWKHNQ9yHJS1qW3tFYwzU4ZDa1N0yvoGLmWns="; + cargoSha256 = "sha256-wMC2GAVVxkwrgJtOIJL0P+Uxh+ouW4VwLDrXJlD10AA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix index 4c546b0631..b494ed7e99 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "367.0.0"; + version = "370.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-x86_64.tar.gz"; - sha256 = "1zhymqk0ax8qjywwa9w3dvhia8khwkq9xaza5vnbg8arcnf8ncll"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86_64.tar.gz"; + sha256 = "0qkgny15k8bni5zwkqqcn9h7nzy9g71ykbxf33g3zni7l2icy985"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-darwin-x86_64.tar.gz"; - sha256 = "0cq22jgmsclp6gaylbh53fbwvl8hi4zswknb6kwqmadhd35a6347"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-x86_64.tar.gz"; + sha256 = "15p1gvwd1wzjl6a4pa7madbakvy5xmjd0k0mp6c7ci8rwgi431g0"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-arm.tar.gz"; - sha256 = "1vmg5665m0hwy8kd4snc1hq7qk81pdmyk94ryg8zpjliwmna65iy"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-arm.tar.gz"; + sha256 = "1xgxg6w7j8y7q8glzji69sh5g3bz1jhjk6jhmmv68c1l7p5na3bg"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-darwin-arm.tar.gz"; - sha256 = "00p0ww72sn4l9cjcjcml43hj0hlbmcnc1razg99fx1s88h0v928n"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-arm.tar.gz"; + sha256 = "19ywsi52sla9wprgmrhlr3q91np9pacspjj58qb7m506pl44hmk4"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-x86.tar.gz"; - sha256 = "1pyjb53imjrfn2izyl60kasysi11virybvnsr2sn1c5d97lx1aah"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86.tar.gz"; + sha256 = "0k4c1kgkvbhwm5fy3yfc2i9rlf7wf186v20nl428dd9742ppa92f"; }; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/update.sh b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/update.sh index ac6bee4dfe..2aae6129db 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="367.0.0" +VERSION="370.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 25287dca9c..382ce50362 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UZTt/+K8jDFhkNIMRfyDzRqOlceAEQKWwgEf1lcZIkY="; + sha256 = "sha256-hJe9JAUZZY2fx4I6+pVg1BYwzZrUWCkqPvQUT2OQXDo="; }; - cargoSha256 = "sha256-VE161UZKUiG2WW7CwjazQfR9ouOAsYCjiA5dczFQliM="; + cargoSha256 = "sha256-BChYzSnM9jnLioRhRDez6XOjJwGrU+giV4Ld3rp/57M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index e843c0d347..04f66eaba9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rCo3iHLfiEH/+APNztKKSdoJerz161jF7sNx8qTFw3U="; + sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M="; }; vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE="; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix index b0c8a5b9ef..8c886b0e2d 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "sha256-0FAiRCAJICp5LliL7FiSHBI/8Eb8dV9/InKHGlvXljY="; + sha256 = "sha256-wO1YYpJDlhw/HskMCLEf+TJh5Wjb/c4r87dZ7npKO3w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.upstream b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.upstream deleted file mode 100644 index 1b83459863..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://ck.kolivas.org/apps/lrzip/ -version_link '[.]tar[.]bz2$' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index 3c2dfaf2f1..fe2047a6f1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ gpl2 lgpl21 ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index bb042a95ec..a1831d44ad 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; - updateWalker = true; homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.upstream b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.upstream deleted file mode 100644 index d56fa42f1d..0000000000 --- a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.upstream +++ /dev/null @@ -1,6 +0,0 @@ -url https://sourceforge.net/projects/smbnetfs/files/smbnetfs/ -version_link '[-][0-9.]+[a-z]*/$' -version_link '[.]tar[.][a-z0-9]+/download$' -SF_redirect -version '.*[-]([0-9.]+[a-z]*)[.]tar[.].*' '\1' -do_overwrite () { do_overwrite_just_version; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix index e77e8fae0c..eed06602a5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/barcode/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; # Maybe other non-darwin Unix downloadPage = "https://ftp.gnu.org/gnu/barcode/"; - updateWalker = true; homepage = "https://www.gnu.org/software/barcode/"; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cuneiform/default.upstream b/third_party/nixpkgs/pkgs/tools/graphics/cuneiform/default.upstream deleted file mode 100644 index 4fb85a2a1e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/cuneiform/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url https://launchpad.net/cuneiform-linux/+download - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" - set_var_value ' url' "$CURRENT_URL" -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch index b88d6e0231..2830acdd96 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/ignore_links.patch @@ -6,7 +6,7 @@ index 5f34d62..36999a3 100644 FILE_RE = re.compile(r"^\s*File:.*$") DEVICE_RE = re.compile(r"Device: [0-9a-f]+h/[0-9]+d\s+") INODE_RE = re.compile(r"Inode: [0-9]+\s+") -+ LINKS_RE = re.compile(r'Links: [0-9]+\s+') ++ LINKS_RE = re.compile(r"Links: [0-9]+\s+") ACCESS_TIME_RE = re.compile(r"^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$") CHANGE_TIME_RE = re.compile(r"^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$") BIRTH_TIME_RE = re.compile(r"^\s*Birth:.*$") diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix index 3d7b9c25ce..83be1943a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-NsYfKnWwkPLd//YU8p9e8jeoM8ZmbBlzi2jkHBOXT/M="; + sha256 = "sha256-pKjSEK0DuQf2rBkOtqRhfhnpEHMqvmXwzKrwKL/T3QU="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 0b2d573714..f0984696fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.16.0"; + version = "2.17.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-16qe5FKMC8cpGDR5HRVslYfG/OA8NSCuAbHpG7dfb3A="; + sha256 = "sha256-yac/WUVL10JU1V5f9LYh57yYzZ2JMf24jMd8Mun7OMU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-FX8fkG+Ecx9ZnbpX8UlLKYh4V6IJ98IbvBln0gCdD2M="; + cargoSha256 = "sha256-Q0ZLMbnQeG/64QvAIPpa3k+lI6dbSSQcdYb5e2rX8U0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index d79030f0f4..537b964f6f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -17,14 +17,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.1.1"; + version = "2022.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-cqL+54Hjqql1YpsXEFLTD5UhxoEizFSr//4TZm7QEVU="; + sha256 = "sha256-hq+gYhDkEzIqgP4CcHRuA5A9694L3LeW9bditejfjm8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ised/default.upstream b/third_party/nixpkgs/pkgs/tools/misc/ised/default.upstream deleted file mode 100644 index 6539bf477e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/ised/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://ised.sourceforge.net/web_nav.html -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix new file mode 100644 index 0000000000..08755ede14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "mandown"; + version = "0.1.3"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-8a4sImsjw+lzeVK4V74VpIKDcAhMR1bOmJYVWzfWEfc="; + }; + + cargoHash = "sha256-Wf1+dxwgPZ4CHpas+3P6n6kKDIISbnfI01+XksjxQlQ="; + + meta = with lib; { + description = "Markdown to groff (man page) converter"; + homepage = "https://gitlab.com/kornelski/mandown"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix index 511314324f..3b12175fb5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -94,6 +94,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; repositories.git = "https://github.com/MidnightCommander/mc.git"; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix index 50648716e1..0e2db1b986 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mmctl"; - version = "6.2.1"; + version = "6.3.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-DhkBiczQ+4iwoufHMuy6Fn3a4q7gvkKGXTfLcUCCKis="; + sha256 = "sha256-hrNVDHM8AweAdda9SC29EGhkOhdiLD0EE1BLPhwe5SI="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix index 8008ffe770..a9c2a43734 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.3.0"; + version = "8.5.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "sha256-bBSIep72htYRLyCW7R2la6q+X+tLqSVziazGsm0KI+o="; + sha256 = "sha256-6IUNJ3DE+nRc+bmpDO7l1gXlD6UDGggTSYRMFT57v/Q="; }; nativeBuildInputs = [ go redo-apenwarr ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 379c896210..468fa433e8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ let pname = "vector"; - version = "0.19.0"; + version = "0.19.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -38,10 +38,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A+Ok/BNEs0V00B8P6ghSHZ2pQ8tumfpkurplnvjpWZ8="; + sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs="; }; - cargoSha256 = "sha256-B9z+8TqAl0yFaou1LfNcFsDJjw7qGti6MakDPhz49tc="; + cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q="; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -71,8 +71,10 @@ rustPlatform.buildRustPackage { # flaky on linux-x86_64 "--skip=sources::socket::test::tcp_with_tls_intermediate_ca" - "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics" + "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events" + "--skip=sources::aws_kinesis_firehose::tests::aws_kinesis_firehose_forwards_events_gzip_request" + "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure" ]; # recent overhauls of DNS support in 0.9 mean that we try to resolve diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix index d32cf0fedb..9ddf853b7d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstake/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnstake"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "pwnesia"; repo = pname; rev = "v${version}"; - sha256 = "0mjwnb0zyqnwk26f32v9vqxc9k6zcks9nn1595mf2hck5xwn86yk"; + sha256 = "sha256-XfZDRu1UrH5nVh1GQCQVaEamKorWSOxQZs556iDqfS8="; }; - vendorSha256 = "1xhzalx1x8js449w1qs2qdwbnz2s8mmypz9maj7jzl5mqfyhlwlp"; + vendorSha256 = "sha256-l3IKvcO10C+PVDX962tFWny7eMNC48ATIVqiHjpVH/Y="; meta = with lib; { description = "Tool to check missing hosted DNS zones"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 54c9c9fca0..dc508ff53e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -28,7 +28,6 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A program for retrieving mail"; homepage = "https://getmail6.org"; - updateWalker = true; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbe dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix index 22606ec78b..647378f1a0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.2.4"; + version = "2.2.7"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "sha256-WXKu+cabMmXNHiLwXrQqS8GQHIWYkee7vPddyGURWic="; + sha256 = "sha256-erpYC4klkgvZ9D+4qM/qIHajsyOGKRbX7lhs6lfWFTQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix b/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix index b6038aa543..ab73eae700 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/twa/default.nix @@ -1,25 +1,25 @@ -{ stdenv +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper , bash , curl -, fetchFromGitHub +, dnsutils , gawk -, host , jq -, lib -, makeWrapper , ncurses , netcat }: stdenv.mkDerivation rec { pname = "twa"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; - rev = version; - sha256 = "1ab3bcyhfach9y15w8ffvqqan2qk8h62n6z8nqbgygi7n1mf6jzx"; + rev = "v${version}"; + hash = "sha256-8c1o03iwStmhjKHmEXIZGyaSOAJRlOuhu0ERjCO5SHg="; }; dontBuild = true; @@ -28,12 +28,14 @@ stdenv.mkDerivation rec { buildInputs = [ bash curl + dnsutils gawk - host.dnsutils jq netcat ]; installPhase = '' + runHook preInstall + install -Dm 0755 twa "$out/bin/twa" install -Dm 0755 tscore "$out/bin/tscore" install -Dm 0644 twa.1 "$out/share/man/man1/twa.1" @@ -41,10 +43,13 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/twa" \ --prefix PATH : ${lib.makeBinPath [ curl - host.dnsutils - jq - ncurses - netcat ]} + dnsutils + gawk + jq + ncurses + netcat ]} + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index 705b2397c6..46093f2c5b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs cssselect + jq keyring lxml markdown2 diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix new file mode 100644 index 0000000000..ba95e0ddbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -0,0 +1,208 @@ +{ lib, fetchFromGitHub +, version +, suffix ? "" +, sha256 ? null +, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; } +, patches ? [ ] +}: +assert (sha256 == null) -> (src != null); +let + atLeast24 = lib.versionAtLeast version "2.4pre"; + atLeast25 = lib.versionAtLeast version "2.5pre"; +in +{ stdenv +, autoconf-archive +, autoreconfHook +, bash +, bison +, boehmgc +, boost +, brotli +, busybox-sandbox-shell +, bzip2 +, callPackage +, coreutils +, curl +, editline +, flex +, gnutar +, gtest +, gzip +, jq +, lib +, libarchive +, libcpuid +, libsodium +, lowdown +, mdbook +, nlohmann_json +, openssl +, perl +, pkg-config +, Security +, sqlite +, util-linuxMinimal +, xz + +, enableDocumentation ? atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform +, enableStatic ? stdenv.hostPlatform.isStatic +, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp +, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp + +, confDir +, stateDir +, storeDir +}: +stdenv.mkDerivation { + pname = "nix"; + + version = "${version}${suffix}"; + VERSION_SUFFIX = suffix; + + inherit src patches; + + outputs = + [ "out" "dev" ] + ++ lib.optionals enableDocumentation [ "man" "doc" ]; + + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals atLeast24 [ + autoconf-archive + autoreconfHook + bison + flex + jq + ] ++ lib.optionals (atLeast24 && enableDocumentation) [ + (lib.getBin lowdown) + mdbook + ] ++ lib.optionals stdenv.isLinux [ + util-linuxMinimal + ]; + + buildInputs = [ + boost + brotli + bzip2 + curl + editline + libsodium + openssl + sqlite + xz + ] ++ lib.optionals stdenv.isDarwin [ + Security + ] ++ lib.optionals atLeast24 [ + gtest + libarchive + lowdown + ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ + libcpuid + ] ++ lib.optionals withLibseccomp [ + libseccomp + ] ++ lib.optionals withAWS [ + aws-sdk-cpp + ]; + + propagatedBuildInputs = [ boehmgc ]; + + NIX_LDFLAGS = lib.optionals (!atLeast24) [ + # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba + (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") + # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 + (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") + ]; + + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + lib.optionalString (!enableStatic) '' + mkdir -p $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + ''} + '' + + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which + # removes config.nix entirely and is not present in 2.3.x, we need to + # patch around an issue where the Nix configure step pulls in the build + # system's bash and other utilities when cross-compiling. + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && !atLeast24) '' + mkdir tmp/ + substitute corepkgs/config.nix.in tmp/config.nix.in \ + --subst-var-by bash ${bash}/bin/bash \ + --subst-var-by coreutils ${coreutils}/bin \ + --subst-var-by bzip2 ${bzip2}/bin/bzip2 \ + --subst-var-by gzip ${gzip}/bin/gzip \ + --subst-var-by xz ${xz}/bin/xz \ + --subst-var-by tar ${gnutar}/bin/tar \ + --subst-var-by tr ${coreutils}/bin/tr + mv tmp/config.nix.in corepkgs/config.nix.in + ''; + + configureFlags = [ + "--with-store-dir=${storeDir}" + "--localstatedir=${stateDir}" + "--sysconfdir=${confDir}" + "--enable-gc" + ] ++ lib.optionals (!enableDocumentation) [ + "--disable-doc-gen" + ] ++ lib.optionals (!atLeast24) [ + # option was removed in 2.4 + "--disable-init-state" + ] ++ lib.optionals stdenv.isLinux [ + "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ + "--with-system=${stdenv.hostPlatform.nix.system}" + ] ++ lib.optionals (!withLibseccomp) [ + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + "--disable-seccomp-sandboxing" + ]; + + makeFlags = [ + "profiledir=$(out)/etc/profile.d" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + doInstallCheck = true; + + # socket path becomes too long otherwise + preInstallCheck = lib.optionalString stdenv.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP + '' + # See https://github.com/NixOS/nix/issues/5687 + + lib.optionalString (atLeast25 && stdenv.isDarwin) '' + echo "exit 99" > tests/gc-non-blocking.sh + ''; + + separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic); + + enableParallelBuilding = true; + + meta = with lib; { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = "https://nixos.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ eelco lovesegfault ]; + platforms = platforms.unix; + outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + }; + + passthru = { + inherit boehmgc; + + perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit src version; }); + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index cfcc3c68c3..490ddcc53b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -1,288 +1,71 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, callPackage +{ lib +, aws-sdk-cpp +, boehmgc +, callPackage +, fetchFromGitHub +, fetchurl +, fetchpatch +, Security + , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, boehmgc -, Security }: - let + boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; }; -common = - { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz - , bash, coreutils, util-linuxMinimal, gzip, gnutar - , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json - , autoreconfHook, autoconf-archive, bison, flex - , jq, libarchive, libcpuid - , lowdown, mdbook - # Used by tests - , gtest - , busybox-sandbox-shell - , storeDir - , stateDir - , confDir - , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp - , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp - , enableStatic ? stdenv.hostPlatform.isStatic - , enableDocumentation ? lib.versionOlder version "2.4pre" || - stdenv.hostPlatform == stdenv.buildPlatform - , pname, version, suffix ? "", src - , patches ? [ ] - }: - let - sh = busybox-sandbox-shell; - - is24 = lib.versionAtLeast version "2.4pre"; - is25 = lib.versionAtLeast version "2.5pre"; - - nix = stdenv.mkDerivation { - inherit pname version src patches; - - VERSION_SUFFIX = suffix; - - outputs = - [ "out" "dev" ] - ++ lib.optionals enableDocumentation [ "man" "doc" ]; - - hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; - - nativeBuildInputs = - [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ] - ++ lib.optionals (is24 && enableDocumentation) [ - (lib.getBin lowdown) mdbook - ] - ++ lib.optionals is24 - [ autoreconfHook - autoconf-archive - bison flex - jq - ]; - - buildInputs = - [ curl libsodium openssl sqlite xz bzip2 - brotli boost editline - ] - ++ lib.optionals stdenv.isDarwin [ Security ] - ++ lib.optionals is24 [ libarchive gtest lowdown ] - ++ lib.optional (is24 && stdenv.isx86_64) libcpuid - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withAWS - ((aws-sdk-cpp.override { - apis = ["s3" "transfer"]; - customMemoryManagement = false; - }).overrideDerivation (args: { - patches = args.patches or [] ++ [ - ./aws-sdk-cpp-TransferManager-ContentEncoding.patch - ]; - })); - - propagatedBuildInputs = [ boehmgc ]; - - NIX_LDFLAGS = lib.optionals (!is24) [ - # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba - (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") - # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 - (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") - ]; - - preConfigure = - # Copy libboost_context so we don't get all of Boost in our closure. - # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString (!enableStatic) '' - mkdir -p $out/lib - cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib - rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' - chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* - ''} - '' + - # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which - # removes config.nix entirely and is not present in 2.3.x, we need to - # patch around an issue where the Nix configure step pulls in the build - # system's bash and other utilities when cross-compiling. - lib.optionalString ( - stdenv.buildPlatform != stdenv.hostPlatform && !is24 - ) '' - mkdir tmp/ - substitute corepkgs/config.nix.in tmp/config.nix.in \ - --subst-var-by bash ${bash}/bin/bash \ - --subst-var-by coreutils ${coreutils}/bin \ - --subst-var-by bzip2 ${bzip2}/bin/bzip2 \ - --subst-var-by gzip ${gzip}/bin/gzip \ - --subst-var-by xz ${xz}/bin/xz \ - --subst-var-by tar ${gnutar}/bin/tar \ - --subst-var-by tr ${coreutils}/bin/tr - mv tmp/config.nix.in corepkgs/config.nix.in - ''; - - configureFlags = - [ "--with-store-dir=${storeDir}" - "--localstatedir=${stateDir}" - "--sysconfdir=${confDir}" - "--enable-gc" - ] - ++ lib.optional (!enableDocumentation) "--disable-doc-gen" - ++ lib.optionals (!is24) [ - # option was removed in 2.4 - "--disable-init-state" - ] - ++ lib.optionals stdenv.isLinux [ - "--with-sandbox-shell=${sh}/bin/busybox" - ] - ++ lib.optional ( - stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) "--with-system=${stdenv.hostPlatform.nix.system}" - # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - - makeFlags = [ "profiledir=$(out)/etc/profile.d" ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - doInstallCheck = true; # not cross - - # socket path becomes too long otherwise - preInstallCheck = lib.optionalString stdenv.isDarwin '' - export TMPDIR=$NIX_BUILD_TOP - '' - # See https://github.com/NixOS/nix/issues/5687 - + lib.optionalString (is25 && stdenv.isDarwin) '' - echo "exit 99" > tests/gc-non-blocking.sh - ''; - - separateDebugInfo = stdenv.isLinux && (is24 -> !enableStatic); - - enableParallelBuilding = true; - - meta = with lib; { - description = "Powerful package manager that makes package management reliable and reproducible"; - longDescription = '' - Nix is a powerful package manager for Linux and other Unix systems that - makes package management reliable and reproducible. It provides atomic - upgrades and rollbacks, side-by-side installation of multiple versions of - a package, multi-user package management and easy setup of build - environments. - ''; - homepage = "https://nixos.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco lovesegfault ]; - platforms = platforms.unix; - outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; - }; - - passthru = { - is24 = lib.warn ''nix package: attribute .is24 is deprecated. Please use lib.versionAtLeast X.version "2.4pre".'' is24; - is25 = lib.warn ''nix package: attribute .is25 is deprecated. Please use lib.versionAtLeast X.version "2.5pre".'' is25; - - perl-bindings = perl.pkgs.toPerlModule (stdenv.mkDerivation { - pname = "nix-perl"; - inherit version; - - inherit src; - - postUnpack = "sourceRoot=$sourceRoot/perl"; - - # This is not cross-compile safe, don't have time to fix right now - # but noting for future travellers. - nativeBuildInputs = - [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; - - configureFlags = - [ "--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}" - ]; - - preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; - }); - inherit boehmgc; - }; - }; - in nix; - - boehmgc_nix_2_3 = boehmgc.override { - enableLargeConfig = true; - }; - - boehmgc_nix = boehmgc_nix_2_3.overrideAttrs (drv: { - patches = (drv.patches or []) ++ [ - # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 - (fetchpatch { - url = "https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff"; - sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; - }) - ]; + boehmgc-nix = boehmgc-nix_2_3.overrideAttrs (drv: { + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + patches = (drv.patches or [ ]) ++ [ ./patches/boehmgc-coroutine-sp-fallback.patch ]; }); - # master: https://github.com/NixOS/nix/pull/5536 - # 2.4: https://github.com/NixOS/nix/pull/5537 - installNlohmannJsonPatch = fetchpatch { - url = "https://github.com/NixOS/nix/pull/5536.diff"; - sha256 = "sha256-SPnam4xNIjbMgnq6IP1AaM1V62X0yZNo4DEVmI8sHOo="; - }; - - buildNix = - { version, suffix ? "" - , src ? null, sha256 ? null - , boehmgc ? boehmgc_nix, patches ? [ ] - }: - assert (src == null) -> (sha256 != null); - assert (sha256 == null) -> (src != null); - callPackage common { - pname = "nix"; - version = "${version}${suffix}"; - inherit suffix; - - src = - if src != null - then src - else fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = version; - inherit sha256; - }; - - inherit boehmgc patches; - inherit storeDir stateDir confDir; - }; + aws-sdk-cpp-nix = (aws-sdk-cpp.override { + apis = [ "s3" "transfer" ]; + customMemoryManagement = false; + }).overrideDerivation (args: { + patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; + }); + common = args: + callPackage + (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) + { + inherit Security storeDir stateDir confDir; + boehmgc = boehmgc-nix; + aws-sdk-cpp = aws-sdk-cpp-nix; + }; in rec { - nix = nixStable; - - nixStable = nix_2_5; - - nix_2_3 = buildNix rec { + nix_2_3 = (common rec { version = "2.3.16"; src = fetchurl { url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; }; - boehmgc = boehmgc_nix_2_3; - }; + }).override { boehmgc = boehmgc-nix_2_3; }; - nix_2_4 = buildNix { + nix_2_4 = common { version = "2.4"; sha256 = "sha256-op48CCDgLHK0qV1Batz4Ln5FqBiRjlE6qHTiZgt3b6k="; - patches = [ installNlohmannJsonPatch ]; + # https://github.com/NixOS/nix/pull/5537 + patches = [ ./patches/install-nlohmann_json-headers.patch ]; }; - nix_2_5 = buildNix { + nix_2_5 = common { version = "2.5.1"; sha256 = "sha256-GOsiqy9EaTwDn2PLZ4eFj1VkXcBUbqrqHehRE9GuGdU="; - patches = [ installNlohmannJsonPatch ]; + # https://github.com/NixOS/nix/pull/5536 + patches = [ ./patches/install-nlohmann_json-headers.patch ]; }; - nix_2_6 = buildNix { + nix_2_6 = common { version = "2.6.0"; sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - nixUnstable = lib.lowPrio (buildNix rec { + # FIXME: nix_2_6 is broken on aarch64-darwin for now. + stable = nix_2_5; + + unstable = lib.lowPrio (common rec { version = "2.7"; suffix = "pre20220124_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix new file mode 100644 index 0000000000..069a22d3a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix @@ -0,0 +1,44 @@ +{ stdenv +, perl +, pkg-config +, curl +, nix +, libsodium +, boost +, autoreconfHook +, autoconf-archive +, nlohmann_json + +, version +, src +}: + +stdenv.mkDerivation { + pname = "nix-perl"; + inherit version src; + + postUnpack = "sourceRoot=$sourceRoot/perl"; + + # This is not cross-compile safe, don't have time to fix right now + # but noting for future travellers. + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + boost + curl + libsodium + nix + nlohmann_json + perl + pkg-config + ]; + + configureFlags = [ + "--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}" + "--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}" + ]; + + preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + preBuild = "unset NIX_INDENT_MAKE"; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/aws-sdk-cpp-TransferManager-ContentEncoding.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/package-management/nix/aws-sdk-cpp-TransferManager-ContentEncoding.patch rename to third_party/nixpkgs/pkgs/tools/package-management/nix/patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch new file mode 100644 index 0000000000..e659bf470d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -0,0 +1,45 @@ +diff --git a/pthread_stop_world.c b/pthread_stop_world.c +index 4b2c429..1fb4c52 100644 +--- a/pthread_stop_world.c ++++ b/pthread_stop_world.c +@@ -673,6 +673,8 @@ GC_INNER void GC_push_all_stacks(void) + struct GC_traced_stack_sect_s *traced_stack_sect; + pthread_t self = pthread_self(); + word total_size = 0; ++ size_t stack_limit; ++ pthread_attr_t pattr; + + if (!EXPECT(GC_thr_initialized, TRUE)) + GC_thr_init(); +@@ -722,6 +724,31 @@ GC_INNER void GC_push_all_stacks(void) + hi = p->altstack + p->altstack_size; + /* FIXME: Need to scan the normal stack too, but how ? */ + /* FIXME: Assume stack grows down */ ++ } else { ++ if (pthread_getattr_np(p->id, &pattr)) { ++ ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); ++ } ++ if (pthread_attr_getstacksize(&pattr, &stack_limit)) { ++ ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!"); ++ } ++ if (pthread_attr_destroy(&pattr)) { ++ ABORT("GC_push_all_stacks: pthread_attr_destroy failed!"); ++ } ++ // When a thread goes into a coroutine, we lose its original sp until ++ // control flow returns to the thread. ++ // While in the coroutine, the sp points outside the thread stack, ++ // so we can detect this and push the entire thread stack instead, ++ // as an approximation. ++ // We assume that the coroutine has similarly added its entire stack. ++ // This could be made accurate by cooperating with the application ++ // via new functions and/or callbacks. ++ #ifndef STACK_GROWS_UP ++ if (lo >= hi || lo < hi - stack_limit) { // sp outside stack ++ lo = hi - stack_limit; ++ } ++ #else ++ #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix." ++ #endif + } + GC_push_all_stack_sections(lo, hi, traced_stack_sect); + # ifdef STACK_GROWS_UP diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch new file mode 100644 index 0000000000..8b92de2290 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch @@ -0,0 +1,36 @@ +From 3884f7a69a57d8ecfcbcaae476ec2ff53ffbd549 Mon Sep 17 00:00:00 2001 +From: Robert Hensing +Date: Thu, 11 Nov 2021 11:03:21 +0100 +Subject: [PATCH] Install nlohmann_json headers + +These headers are included by the libexpr, libfetchers, libstore +and libutil headers. +Considering that these are vendored sources, Nix should expose them, +as it is not a good idea for reverse dependencies to rely on a +potentially different source that can go out of sync. +--- + Makefile | 1 + + src/nlohmann/local.mk | 2 ++ + 2 files changed, 3 insertions(+) + create mode 100644 src/nlohmann/local.mk + +diff --git a/Makefile b/Makefile +index 5040d288485..e6ce50cbdb7 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,6 +10,7 @@ makefiles = \ + src/libexpr/local.mk \ + src/libcmd/local.mk \ + src/nix/local.mk \ ++ src/nlohmann/local.mk \ + src/resolve-system-dependencies/local.mk \ + scripts/local.mk \ + misc/bash/local.mk \ +diff --git a/src/nlohmann/local.mk b/src/nlohmann/local.mk +new file mode 100644 +index 00000000000..63c427e000e +--- /dev/null ++++ b/src/nlohmann/local.mk +@@ -0,0 +1,2 @@ ++$(foreach i, $(wildcard src/nlohmann/*.hpp), \ ++ $(eval $(call install-file-in, $(i), $(includedir)/nlohmann, 0644))) diff --git a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix index 76b0c1fa98..5fb88ca992 100644 --- a/third_party/nixpkgs/pkgs/tools/security/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "1l5c7vdi885z56nqqbm4sw9hvqk3rfzm0mgcwk5cbwjlrz7yjq4m"; + sha256 = "sha256-+vipQl/HWoYnOPkQLjeIedpnnqPVYaUWhks9eCgMOxQ="; }; - cargoSha256 = "0dmhlyrw6yd7p80v7anz5nrd28bcrhq27vzy605dinddvncjn13q"; + cargoSha256 = "sha256-xWEQvCyd8auE0q9rBt9iDgU8Dscf4pq/gsAINH2eQY4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix b/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix index 121c71fab3..a9e554ff42 100644 --- a/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix @@ -5,7 +5,7 @@ let pname = "beyond-identity"; - version = "2.45.0-0"; + version = "2.49.0-0"; libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); meta = with lib; { description = "Passwordless MFA identities for workforces, customers, and developers"; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb"; - sha512 = "852689d473b7538cdca60d264295f39972491b5505accad897fd924504189f0a6d8b6481cc0520ee762d4642e0f4fd664a03b5741f9ea513ec46ab16b05158f2"; + sha512 = "sha512-+9vwH1r5WW+MqyiwsAFInboaM7o2dc7zvRaKwHC/o2LOBugvUHmUzmZ6uSHilc9zQ5FcHUIIglhkASbFtsvPeA=="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix index 4af91f8070..58abf25b85 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dnspeep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "dnspeep"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "jvns"; repo = pname; rev = "v${version}"; - sha256 = "0lz22vlgi1alsq676q4nlzfzwnsrvziyqdnmdbn00rwqsvlb81q6"; + sha256 = "sha256-QpUbHiMDQFRCTVyjrO9lfQQ62Z3qanv0j+8eEXjE3n4="; }; - cargoSha256 = "sha256-I1m+6M2tmmTZuXlZaecSslj6q2iCsMBq7k9vHiMd3WE="; + cargoSha256 = "sha256-w81FewtyweuSNYNPNr2uxB0uB1JoN5t252CAG1pm4Z8="; LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; LIBPCAP_VER = libpcap.version; diff --git a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix index f88abbd7e1..b79dba7c32 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doas/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "doas"; - version = "6.8.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "sha256-F0FVVspGDZmzxy4nsb/wsEoCw4eHscymea7tIKrWzD0="; + sha256 = "9uOQ2Ta5HzEpbCz2vbqZEEksPuIjL8lvmfmynfqxMeM="; }; # otherwise confuses ./configure diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index fabab51525..a59fc1dc90 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-01-25"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-kqb5MhdKA6qvIdnTzPNUscksyz2GWaiPJg2JxA1C3p0="; + sha256 = "sha256-5WdAh4YFNLOF8h8f0pN6GHdoyASf/3fN345Mp9b1Cfg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index bc7731a0a7..d6f2e20611 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' - The nitrokey-app provides a QT system tray widget with wich you can + The nitrokey-app provides a QT system tray widget with which you can access the extra functionality of a Nitrokey Storage or Nitrokey Pro. See https://www.nitrokey.com/ for more information. ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix new file mode 100644 index 0000000000..b50550e743 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix @@ -0,0 +1,44 @@ +{ python3Packages, lib }: + +with python3Packages; + +buildPythonApplication rec { + pname = "pynitrokey"; + version = "0.4.9"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-mhH6mVgLRX87PSGTFkj1TE75jU1lwcaRZWbC67T+vWo="; + }; + + propagatedBuildInputs = [ + click + cryptography + ecdsa + fido2 + intelhex + pyserial + pyusb + requests + pygments + python-dateutil + urllib3 + cffi + cbor + nkdfu + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "pynitrokey" ]; + + meta = with lib; { + description = "Python client for Nitrokey devices"; + homepage = "https://github.com/Nitrokey/pynitrokey"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ frogamic ]; + mainProgram = "nitropy"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 76aea2bbd5..47bf2c8297 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -23,13 +23,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; }; - postPatch = '' - ${optionalString withPkcs11 '' - substituteInPlace rngd.c \ - --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so - ''} - ''; - nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ @@ -49,8 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # For cross-compilation - makeFlags = [ "AR:=$(AR)" ]; + makeFlags = [ + "AR:=$(AR)" # For cross-compilation + ] ++ optionals (withPkcs11) [ + "PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths + ]; doCheck = true; preCheck = "patchShebangs tests/*.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix b/third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix index d6a99dd710..393ac90d31 100644 --- a/third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/volatility3/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "volatility3"; - version = "1.0.1"; + version = "2.0.0"; disabled = python3.pythonOlder "3.6"; @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "volatilityfoundation"; repo = pname; rev = "v${version}"; - sha256 = "1k56izgkla9mrjrkp1saavajdx9x1wkqpwmbpvxv9rw5k80m5a4a"; + sha256 = "141n09cdc17pfdhs01aw8l4cvsqpcz8ji5l4gi7r88cyf4ix2lnz"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix b/third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix index ce996bf7c6..f7501d7680 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/dd_rescue/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; license = licenses.gpl2Plus; - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/di/default.nix b/third_party/nixpkgs/pkgs/tools/system/di/default.nix index 6dcd3e87f6..06d9130590 100644 --- a/third_party/nixpkgs/pkgs/tools/system/di/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/di/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { description = "Disk information utility; displays everything 'df' does and more"; homepage = "https://gentoo.com/di/"; license = licenses.zlib; - updateWalker = true; maintainers = with maintainers; [ manveru ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix index 9d2e668762..a3bb99735a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -37,7 +37,5 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice - - updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream b/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream deleted file mode 100644 index 45e3a93682..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/ipmiutil/files/ -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix index 928f401c38..8da1917fdd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vgrep/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vgrep"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "vrothberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pWRc1EjL09zFT/8HLrosuCJ5qTDj2VaizoI/Eu8jsgM="; + sha256 = "sha256-RLyEOvNhb1oXPYYxVZKc+xN2uCgUaWMxh8dPEOUfAFA="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index b7b20996bd..ade2b437c5 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "10mlkkprky7qqjrkv43v1lzmlgdjpkzy3729k9xxdm5mpq5bjdwj"; + sha256 = "0vyvmfrq3jnwqqjf2rsd5qnnwvvq71165ws7smnxk5jn8lqkq6z1"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.112.3"; - specSha256 = "15qlk0vd6l1gkxjbmvfwwdgjv7517y0kf0s3d32r3m2xqdsw9pc6"; + specVersion = "4.113.0"; + specSha256 = "0r02h6a75ad2yahff62ilmlcnp3w4j4djkx187zyh9kdvf1lzqb9"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "linode"; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 060f2c0687..256ce30759 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -284,6 +284,7 @@ mapAliases ({ flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 + fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # added 2022-01-26 foldingathome = fahclient; # added 2020-09-03 font-awesome-ttf = font-awesome; # 2018-02-25 # 2019-10-31 @@ -412,6 +413,7 @@ mapAliases ({ inotifyTools = inotify-tools; inter-ui = inter; # added 2021-03-27 iproute = iproute2; # moved from top-level 2021-03-14 + ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # added 2021-12-15 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 jack2Full = jack2; # moved from top-level 2021-03-14 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 @@ -662,7 +664,13 @@ mapAliases ({ nilfs_utils = nilfs-utils; # added 2018-04-25 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixStable; # added 2021-05-21 + nixFlakes = nixVersions.stable; # added 2021-05-21 + nixStable = nixVersions.stable; # added 2022-01-24 + nixUnstable = nixVersions.unstable; # added 2022-01-26 + nix_2_3 = nixVersions.nix_2_3; + nix_2_4 = nixVersions.nix_2_4; + nix_2_5 = nixVersions.nix_2_5; + nix_2_6 = nixVersions.nix_2_6; nmap_graphical = nmap-graphical; # added 2017-01-19 nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 @@ -1028,6 +1036,7 @@ mapAliases ({ tftp_hpa = tftp-hpa; # added 2015-04-03 timescale-prometheus = promscale; # added 2020-09-29 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 + tomboy = throw "tomboy is not actively developed anymore and was removed."; # added 2022-01-27 tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 0c8d9ed73a..55669acf3e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -67,7 +67,7 @@ with pkgs; clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; # For convenience, allow callers to get the path to Nixpkgs. - path = config.path; + path = ../..; ### Helper functions. @@ -2929,9 +2929,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - element-desktop-wayland = element-desktop.override { - useWayland = true; - }; + element-desktop-wayland = writeScript "element-desktop-wayland" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" + ''; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { conf = config.element-web.conf or {}; @@ -3366,6 +3367,8 @@ with pkgs; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; + mandown = callPackage ../tools/misc/mandown { }; + mapcidr = callPackage ../tools/misc/mapcidr { }; mapproxy = callPackage ../applications/misc/mapproxy { }; @@ -4923,9 +4926,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; electron = electron_13; }; - schildichat-desktop-wayland = schildichat-desktop.override { - useWayland = true; - }; + schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" '' + #!/bin/sh + NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" + ''; schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { conf = config.schildichat-web.conf or {}; @@ -8641,11 +8645,6 @@ with pkgs; pngout = callPackage ../tools/graphics/pngout { }; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { - flex = flex_2_5_35; - openssl = openssl_1_0_2; - }; - patch = gnupatch; patchage = callPackage ../applications/audio/patchage { }; @@ -14495,8 +14494,6 @@ with pkgs; ctmg = callPackage ../tools/security/ctmg { }; - cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -19030,9 +19027,7 @@ with pkgs; ogre = ogre1_9; }; - mysocketw = callPackage ../development/libraries/mysocketw { - openssl = openssl_1_0_2; - }; + mysocketw = callPackage ../development/libraries/mysocketw { }; mythes = callPackage ../development/libraries/mythes { }; @@ -21645,7 +21640,6 @@ with pkgs; openfire = callPackage ../servers/xmpp/openfire { }; - softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; }; softether_4_29 = callPackage ../servers/softether/4.29.nix { }; softether = softether_4_29; @@ -25737,10 +25731,6 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; - fme = callPackage ../applications/misc/fme { - inherit (gnome2) libglademm; - }; - fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -26804,7 +26794,10 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { + # Fix-Me: This locking should be removed once PR #154059 is merged. + buildGoModule = buildGo117Module; + }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; @@ -28257,9 +28250,7 @@ with pkgs; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { - withGrass = false; - }; + qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; qgis = callPackage ../applications/gis/qgis { }; @@ -28959,6 +28950,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talentedhack = callPackage ../applications/audio/talentedhack { }; tambura = callPackage ../applications/audio/tambura { }; @@ -32637,9 +32630,7 @@ with pkgs; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; - tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake_2_8; - }; + tulip = libsForQt5.callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; @@ -33132,18 +33123,13 @@ with pkgs; neo = callPackage ../applications/misc/neo { }; - inherit (callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; - }) - nix - nixStable - nix_2_3 - nix_2_4 - nix_2_5 - nix_2_6 - nixUnstable; + nixVersions = callPackage ../tools/package-management/nix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + }; + + nix = nixVersions.stable; nixStatic = pkgsStatic.nix; @@ -33316,7 +33302,7 @@ with pkgs; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); - nixos-option = callPackage ../tools/nix/nixos-option { nix = nix_2_3; }; + nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -33784,6 +33770,8 @@ with pkgs; vnote = libsForQt5.callPackage ../applications/office/vnote { }; + sshportal = callPackage ../servers/sshportal { }; + ssh-audit = callPackage ../tools/security/ssh-audit { }; ssh-tools = callPackage ../applications/misc/ssh-tools { }; @@ -34175,8 +34163,6 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { }; - imatix_gsl = callPackage ../development/tools/imatix_gsl {}; sccache = callPackage ../development/tools/misc/sccache { @@ -34207,6 +34193,8 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; + pynitrokey = callPackage ../tools/security/pynitrokey { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/config.nix b/third_party/nixpkgs/pkgs/top-level/config.nix index bb4f668d60..7a5b4bdd17 100644 --- a/third_party/nixpkgs/pkgs/top-level/config.nix +++ b/third_party/nixpkgs/pkgs/top-level/config.nix @@ -32,20 +32,6 @@ let feature = "run checkPhase by default"; }; - path = mkOption { - type = types.path; - default = ../..; - defaultText = lib.literalDocBook "a path expression"; - internal = true; - description = '' - A reference to Nixpkgs' own sources. - - This is overridable in order to avoid copying sources unnecessarily, - as a path expression that references a store path will not short-circuit - to the store path itself, but copy the store path instead. - ''; - }; - }; in { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index e8cdd09e54..f7d291928f 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -11863,8 +11863,8 @@ let pname = "libnet"; version = "3.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.12.tar.gz"; - sha256 = "1px35q9qchzd7rxqldj87vbrall8v31blidhmh0d25d5hyq9lw25"; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.13.tar.gz"; + sha256 = "sha256-WjX7Hy1KopFoDrGvOImfq0U8IsKOcffHvTdHtaPbNIw="; }; patches = [ (fetchpatch { @@ -17024,6 +17024,20 @@ let doCheck = false; }; + OpenOfficeOODoc = buildPerlPackage { + pname = "OpenOffice-OODoc"; + version = "2.125"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMGDOC/OpenOffice-OODoc-2.125.tar.gz"; + sha256 = "1dnsj63svxq0hi3aci4x7binql8kr754inlkks5jmi4k0sblh561"; + }; + propagatedBuildInputs = [ ArchiveZip XMLTwig ]; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ maintainers.wentasah ]; + }; + }; + NetOpenIDCommon = buildPerlPackage { pname = "Net-OpenID-Common"; version = "1.20"; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 9180421746..cea65edb41 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -175,6 +175,8 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; + ds = callPackage ../development/php-packages/ds { }; + event = callPackage ../development/php-packages/event { }; gnupg = callPackage ../development/php-packages/gnupg { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 183ea8574c..0b544bc862 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -5405,6 +5405,8 @@ in { nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + nkdfu = callPackage ../development/python-modules/nkdfu { }; + nltk = callPackage ../development/python-modules/nltk { }; nmapthon2 = callPackage ../development/python-modules/nmapthon2 { }; @@ -7919,7 +7921,7 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; pythonix = callPackage ../development/python-modules/pythonix { - nix = pkgs.nix_2_3; + nix = pkgs.nixVersions.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; };