diff --git a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml index de8ac36e467f..4e783e424728 100644 --- a/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml +++ b/.github/ISSUE_TEMPLATE/03_bug_report_nixos.yml @@ -103,7 +103,7 @@ body: Please note that the maintainer attribute name does not always match the maintainer's GitHub username. If that occurs, try looking in [`maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix) for the maintainer attribute name, and checking if the maintainer has a listed GitHub username. - If in doubt, check `git blame` for whoever last touched the module, or check the associated package's maintainers. Please add the mentions above the `---` characters. + If in doubt, check the associated package's maintainers. Please add the mentions above the `---` characters. value: |2 diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 41c2a414a8fe..811b0687bbdd 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -15,13 +15,13 @@ Searching online for prior art can be helpful if you are running into solved pro ### Github {#javascript-finding-examples-github} -- Searching Nix files for `mkYarnPackage`: -- Searching just `flake.nix` files for `mkYarnPackage`: +- Searching Nix files for `yarnConfigHook`: +- Searching just `flake.nix` files for `yarnConfigHook`: ### Gitlab {#javascript-finding-examples-gitlab} -- Searching Nix files for `mkYarnPackage`: -- Searching just `flake.nix` files for `mkYarnPackage`: +- Searching Nix files for `yarnConfigHook`: +- Searching just `flake.nix` files for `yarnConfigHook`: ## Tools overview {#javascript-tools-overview} @@ -668,7 +668,8 @@ To install the package `yarnInstallHook` uses both `npm` and `yarn` to cleanup p #### yarn2nix {#javascript-yarn2nix} -WARNING: The `yarn2nix` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `yarn2nix` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +> [!WARNING] +> The `yarn2nix` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `yarn2nix` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). ##### Preparation {#javascript-yarn2nix-preparation} @@ -687,6 +688,9 @@ If the downloaded files contain the `package.json` and `yarn.lock` files they ca ##### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} +> [!WARNING] +> The `mkYarnPackage` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `mkYarnPackage` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246). + `mkYarnPackage` will by default try to generate a binary. For packages only generating static assets (Svelte, Vue, React, Webpack, ...), you will need to explicitly override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in `package.json` use: diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index b60a9a3380bc..3dc637b7b7e6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -82,6 +82,8 @@ - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". +- `purple-matrix` has been removed, since it has been unmaintained since April 2022 and upstream does not recommend using it anymore. + - The default Android NDK version has been raised to 27, and the default SDK version to 35. NDK 21–26 have been removed, as they are end‐of‐life. diff --git a/lib/licenses.nix b/lib/licenses.nix index 0abe0f0d4584..40135914b8cd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -157,6 +157,11 @@ lib.mapAttrs mkLicense ( fullName = "Artistic License 2.0"; }; + asl11 = { + spdxId = "Apache-1.1"; + fullName = "Apache License 1.1"; + }; + asl20 = { spdxId = "Apache-2.0"; fullName = "Apache License 2.0"; @@ -279,11 +284,6 @@ lib.mapAttrs mkLicense ( redistributable = true; }; - caossl = { - fullName = "Computer Associates Open Source Licence Version 1.0"; - url = "http://jxplorer.org/licence.html"; - }; - cal10 = { spdxId = "CAL-1.0"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; @@ -932,6 +932,11 @@ lib.mapAttrs mkLicense ( fullName = "Lucent Public License v1.02"; }; + lsof = { + spdxId = "lsof"; + fullName = "lsof License"; # also known as Purdue BSD-Style License + }; + miros = { spdxId = "MirOS"; fullName = "MirOS License"; @@ -1159,11 +1164,6 @@ lib.mapAttrs mkLicense ( fullName = "Public Domain"; }; - purdueBsd = { - fullName = "Purdue BSD-Style License"; # also known as lsof license - url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; - }; - prosperity30 = { fullName = "Prosperity-3.0.0"; free = false; @@ -1180,14 +1180,9 @@ lib.mapAttrs mkLicense ( fullName = "Q Public License 1.0"; }; - qwt = { - fullName = "Qwt License, Version 1.0"; - url = "https://qwt.sourceforge.io/qwtlicense.html"; - }; - - radiance = { - fullName = "The Radiance Software License, Version 2.0"; - url = "https://github.com/LBNL-ETA/Radiance/blob/master/License.txt"; + qwtException = { + spdxId = "Qwt-exception-1.0"; + fullName = "Qwt exception 1.0"; }; ruby = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 347b35e84e6d..dc243490f1a1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4338,12 +4338,6 @@ githubId = 3471749; name = "Claudio Bley"; }; - cbourjau = { - email = "christianb@posteo.de"; - github = "cbourjau"; - githubId = 3288058; - name = "Christian Bourjau"; - }; cbrewster = { email = "cbrewster@hey.com"; github = "cbrewster"; @@ -25393,6 +25387,12 @@ matrix = "@tensor5:matrix.org"; name = "Nicola Squartini"; }; + Tenzer = { + email = "nixpkgs@tenzer.dk"; + github = "Tenzer"; + githubId = 68696; + name = "Jeppe Fihl-Pearson"; + }; teohz = { email = "gitstuff@teohz.com"; github = "teohz"; @@ -29009,4 +29009,3 @@ }; # keep-sorted end } -# Keep the list alphabetically sorted. diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index efa4fc1c05d7..21dcf14b5368 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -31,6 +31,7 @@ { lib }: with lib.maintainers; { + # keep-sorted start case=no numeric=no block=yes newline_separated=yes acme = { members = [ aanderse @@ -258,9 +259,19 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + cosmopolitan = { + members = [ + bbjubjub + tomberek + ]; + scope = "Maintain the Cosmopolitan LibC and related programs."; + shortName = "Cosmopolitan"; + }; + cuda = { members = [ connorbaker + GaetanLepage prusnak samuela SomeoneSerge @@ -293,29 +304,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - cosmopolitan = { - members = [ - bbjubjub - tomberek - ]; - scope = "Maintain the Cosmopolitan LibC and related programs."; - shortName = "Cosmopolitan"; - }; - - dotnet = { - members = [ - mdarocha - corngood - ggg - raphaelr - jamiemagee - anpin - meenzen - ]; - scope = "Maintainers of the .NET build tools and packages"; - shortName = "dotnet"; - }; - deepin = { members = [ wineee ]; scope = "Maintain deepin desktop environment and related packages."; @@ -370,6 +358,20 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + dotnet = { + members = [ + mdarocha + corngood + ggg + raphaelr + jamiemagee + anpin + meenzen + ]; + scope = "Maintainers of the .NET build tools and packages"; + shortName = "dotnet"; + }; + emacs = { members = [ AndersonTorres @@ -497,21 +499,6 @@ with lib.maintainers; shortName = "gitlab"; }; - golang = { - members = [ - kalbasit - katexochen - mic92 - zowoq - qbit - mfrw - ]; - githubTeams = [ "golang" ]; - scope = "Maintain Golang compilers."; - shortName = "Go"; - enableFeatureFreezePing = true; - }; - gnome = { members = [ bobby285271 @@ -535,6 +522,21 @@ with lib.maintainers; shortName = "GNOME Circle"; }; + golang = { + members = [ + kalbasit + katexochen + mic92 + zowoq + qbit + mfrw + ]; + githubTeams = [ "golang" ]; + scope = "Maintain Golang compilers."; + shortName = "Go"; + enableFeatureFreezePing = true; + }; + graalvm-ce = { members = [ bandresen @@ -672,17 +674,6 @@ with lib.maintainers; shortName = "K3s"; }; - kubernetes = { - members = [ - johanot - offline - saschagrunert - srhb - ]; - scope = "Maintain the Kubernetes package and module"; - shortName = "Kubernetes"; - }; - kodi = { members = [ aanderse @@ -697,6 +688,17 @@ with lib.maintainers; shortName = "Kodi"; }; + kubernetes = { + members = [ + johanot + offline + saschagrunert + srhb + ]; + scope = "Maintain the Kubernetes package and module"; + shortName = "Kubernetes"; + }; + libretro = { members = [ aanderse @@ -734,6 +736,19 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + lix = { + members = [ + raitobezarius + qyriad + _9999years + lf- + alois31 + ]; + scope = "Maintain the Lix package manager inside of Nixpkgs."; + shortName = "Lix ecosystem"; + enableFeatureFreezePing = true; + }; + llvm = { members = [ dtzWill @@ -772,6 +787,13 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + lua = { + githubTeams = [ "lua" ]; + scope = "Maintain the lua ecosystem."; + shortName = "lua"; + enableFeatureFreezePing = true; + }; + lumiguide = { # Verify additions by approval of an already existing member of the team. members = [ @@ -782,13 +804,6 @@ with lib.maintainers; shortName = "Lumiguide employees"; }; - lua = { - githubTeams = [ "lua" ]; - scope = "Maintain the lua ecosystem."; - shortName = "lua"; - enableFeatureFreezePing = true; - }; - lumina = { members = [ romildo ]; githubTeams = [ "lumina" ]; @@ -804,7 +819,7 @@ with lib.maintainers; megheaiulian mkg20001 ]; - scope = "All things linuxcontainers. LXC, Incus, LXD and related packages."; + scope = "All things linuxcontainers. Incus, LXC, and related packages."; shortName = "lxc"; }; @@ -849,19 +864,6 @@ with lib.maintainers; shortName = "Matrix"; }; - minimal-bootstrap = { - members = [ - alejandrosame - artturin - emilytrau - ericson2314 - jk - siraben - ]; - scope = "Maintain the minimal-bootstrap toolchain and related packages."; - shortName = "Minimal Bootstrap"; - }; - mercury = { members = [ _9999years @@ -874,31 +876,17 @@ with lib.maintainers; shortName = "Mercury Employees"; }; - # same as https://github.com/orgs/NixOS/teams/nix-team - nix = { + minimal-bootstrap = { members = [ - eelco - mic92 - tomberek - roberth + alejandrosame + artturin + emilytrau ericson2314 + jk + siraben ]; - scope = "Maintain the Nix package manager."; - shortName = "Nix/nix-cli ecosystem"; - enableFeatureFreezePing = true; - }; - - lix = { - members = [ - raitobezarius - qyriad - _9999years - lf- - alois31 - ]; - scope = "Maintain the Lix package manager inside of Nixpkgs."; - shortName = "Lix ecosystem"; - enableFeatureFreezePing = true; + scope = "Maintain the minimal-bootstrap toolchain and related packages."; + shortName = "Minimal Bootstrap"; }; module-system = { @@ -949,6 +937,20 @@ with lib.maintainers; shortName = "NGI"; }; + # same as https://github.com/orgs/NixOS/teams/nix-team + nix = { + members = [ + eelco + mic92 + tomberek + roberth + ericson2314 + ]; + scope = "Maintain the Nix package manager."; + shortName = "Nix/nix-cli ecosystem"; + enableFeatureFreezePing = true; + }; + nixos-rebuild = { members = [ thiagokokada ]; scope = "Maintain nixos-rebuild(-ng)."; @@ -1166,12 +1168,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - sphinx = { - members = [ ]; - scope = "Maintain Sphinx related packages."; - shortName = "Sphinx"; - }; - serokell = { # Verify additions by approval of an already existing member of the team. members = [ balsoft ]; @@ -1179,6 +1175,12 @@ with lib.maintainers; shortName = "Serokell employees"; }; + sphinx = { + members = [ ]; + scope = "Maintain Sphinx related packages."; + shortName = "Sphinx"; + }; + stdenv = { members = [ artturin @@ -1262,6 +1264,16 @@ with lib.maintainers; shortName = "Uzinfocom Open Source"; }; + wdz = { + members = [ + n0emis + johannwagner + yuka + ]; + scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; + shortName = "WDZ GmbH"; + }; + windows = { members = [ RossSmyth @@ -1273,16 +1285,6 @@ with lib.maintainers; shortName = "Windows"; }; - wdz = { - members = [ - n0emis - johannwagner - yuka - ]; - scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; - shortName = "WDZ GmbH"; - }; - xen = { members = [ hehongbo @@ -1316,4 +1318,5 @@ with lib.maintainers; shortName = "Zig"; enableFeatureFreezePing = true; }; + # keep-sorted end } diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index fbc2a0a100dd..0053b51c607c 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -90,6 +90,8 @@ - [nix-store-veritysetup](https://github.com/nikstur/nix-store-veritysetup-generator), a systemd generator to unlock the Nix Store as a dm-verity protected block device. Available as [boot.initrd.nix-store-veritysetup](options.html#opt-boot.initrd.nix-store-veritysetup.enable). +- [ente](https://github.com/ente-io/ente), a service that provides a fully open source, end-to-end encrypted platform for photos and videos. Available as [services.ente.api](#opt-services.ente.api.enable) and [services.ente.web](#opt-services.ente.web.enable). + - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable). - [dwl](https://codeberg.org/dwl/dwl), a compact, hackable compositor for Wayland based on wlroots. Available as [programs.dwl](#opt-programs.dwl.enable). @@ -134,6 +136,8 @@ - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. +- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information. + - The non-LTS Forgejo package (`forgejo`) has been updated to 12.0.0. This release contains breaking changes, see the [release blog post](https://forgejo.org/2025-07-release-v12-0/) for all the details and how to ensure smooth upgrades. diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py index 8115a5967a2d..6f0985479803 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py @@ -241,6 +241,8 @@ class Machine: # Store last serial console lines for use # of wait_for_console_text last_lines: Queue = Queue() + # Store all console output for full log retrieval + full_console_log: list[str] callbacks: list[Callable] def __repr__(self) -> str: @@ -263,6 +265,7 @@ class Machine: self.start_command = start_command self.callbacks = callbacks if callbacks is not None else [] self.logger = logger + self.full_console_log = [] # set up directories self.shared_dir = self.tmp_dir / "shared-xchg" @@ -996,6 +999,8 @@ class Machine: Wait until the supplied regular expressions match a line of the serial console output. This method is useful when OCR is not possible or inaccurate. + + When this method returns, the console output that includes the match has already become part of get_console_log(). """ # Buffer the console output, this is needed # to match multiline regexes. @@ -1020,6 +1025,13 @@ class Machine: while not console_matches(False): pass + def get_console_log(self) -> str: + """ + Get the full console output from the machine since boot. + Returns all serial console output as a single string. + """ + return "\n".join(self.full_console_log) + def send_key( self, key: str, delay: float | None = 0.01, log: bool | None = True ) -> None: @@ -1086,6 +1098,8 @@ class Machine: # Store last serial console lines for use # of wait_for_console_text self.last_lines: Queue = Queue() + # Re-initialize (if this is not the first start) + self.full_console_log: list[str] = [] def process_serial_output() -> None: assert self.process @@ -1093,6 +1107,8 @@ class Machine: for _line in self.process.stdout: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() + self.full_console_log.append(line) + # Put on queue after adding to full_console_log to guarantee ordering self.last_lines.put(line) self.log_serial(line) diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix deleted file mode 100644 index 8c643898b89b..000000000000 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ /dev/null @@ -1,34 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ modulesPath, ... }: - -{ - imports = [ - # Include the default lxd configuration. - "${modulesPath}/virtualisation/lxc-container.nix" - # Include the container-specific autogenerated configuration. - ./lxd.nix - ]; - - networking = { - dhcpcd.enable = false; - useDHCP = false; - useHostResolvConf = false; - }; - - systemd.network = { - enable = true; - networks."50-eth0" = { - matchConfig.Name = "eth0"; - networkConfig = { - DHCP = "ipv4"; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; - }; - - system.stateVersion = "@stateVersion@"; # Did you read the comment? -} diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix deleted file mode 100644 index 0ccc6308b96b..000000000000 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../modules/virtualisation/lxc-container.nix - ]; - - virtualisation.lxc.templates.nix = { - enable = true; - target = "/etc/nixos/lxd.nix"; - template = ./nix.tpl; - when = [ - "create" - "copy" - ]; - }; - - # copy the config for nixos-rebuild - system.activationScripts.config = - let - config = pkgs.replaceVars ./lxd-container-image-inner.nix { - stateVersion = lib.trivial.release; - }; - in - '' - if [ ! -e /etc/nixos/configuration.nix ]; then - install -m 0644 -D ${config} /etc/nixos/configuration.nix - fi - ''; - - networking = { - dhcpcd.enable = false; - useDHCP = false; - useHostResolvConf = false; - }; - - systemd.network = { - enable = true; - networks."50-eth0" = { - matchConfig.Name = "eth0"; - networkConfig = { - DHCP = "ipv4"; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; - }; -} diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix deleted file mode 100644 index 845838d3249d..000000000000 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ /dev/null @@ -1,34 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ modulesPath, ... }: - -{ - imports = [ - # Include the default lxd configuration. - "${modulesPath}/virtualisation/lxd-virtual-machine.nix" - # Include the container-specific autogenerated configuration. - ./lxd.nix - ]; - - networking = { - dhcpcd.enable = false; - useDHCP = false; - useHostResolvConf = false; - }; - - systemd.network = { - enable = true; - networks."50-enp5s0" = { - matchConfig.Name = "enp5s0"; - networkConfig = { - DHCP = "ipv4"; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; - }; - - system.stateVersion = "@stateVersion@"; # Did you read the comment? -} diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix deleted file mode 100644 index 19582e2c0d5d..000000000000 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../modules/virtualisation/lxd-virtual-machine.nix - ]; - - virtualisation.lxc.templates.nix = { - enable = true; - target = "/etc/nixos/lxd.nix"; - template = ./nix.tpl; - when = [ - "create" - "copy" - ]; - }; - - # copy the config for nixos-rebuild - system.activationScripts.config = - let - config = pkgs.replaceVars ./lxd-virtual-machine-image-inner.nix { - stateVersion = lib.trivial.release; - }; - in - '' - if [ ! -e /etc/nixos/configuration.nix ]; then - install -m 0644 -D ${config} /etc/nixos/configuration.nix - fi - ''; - - # Network - networking = { - dhcpcd.enable = false; - useDHCP = false; - useHostResolvConf = false; - }; - - systemd.network = { - enable = true; - networks."50-enp5s0" = { - matchConfig.Name = "enp5s0"; - networkConfig = { - DHCP = "ipv4"; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; - }; -} diff --git a/nixos/maintainers/scripts/lxd/nix.tpl b/nixos/maintainers/scripts/lxd/nix.tpl deleted file mode 100644 index 25ae1bc399f2..000000000000 --- a/nixos/maintainers/scripts/lxd/nix.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, config, pkgs, ... }: - -# WARNING: THIS CONFIGURATION IS AUTOGENERATED AND WILL BE OVERWRITTEN AUTOMATICALLY - -{ - networking.hostName = "{{ container.name }}"; -} diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8813cb8f3d9f..f96d90941323 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -584,7 +584,6 @@ in #shout = 206; #unused #gateone = 207; #removed 2025-08-21 namecoin = 208; - #lxd = 210; # unused #kibana = 211; xtreemfs = 212; calibre-server = 213; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3bfe8ccb982c..3ca08fd4cb47 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1574,6 +1574,7 @@ ./services/web-apps/echoip.nix ./services/web-apps/eintopf.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/ente.nix ./services/web-apps/ethercalc.nix ./services/web-apps/fediwall.nix ./services/web-apps/fider.nix @@ -1921,8 +1922,6 @@ ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix - ./virtualisation/lxd-agent.nix - ./virtualisation/lxd.nix ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ef91e5c2ac75..a3bf0cfc3fb9 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -369,6 +369,11 @@ in (mkRemovedOptionModule [ "services" "gateone" ] '' The gateone module was removed since the package was removed alongside much other obsolete python 2. '') + (mkRemovedOptionModule [ "virtualisation" "lxd" ] '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + '') # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/databases/chromadb.nix b/nixos/modules/services/databases/chromadb.nix index 6610f58ec73e..0e0188f6dd3e 100644 --- a/nixos/modules/services/databases/chromadb.nix +++ b/nixos/modules/services/databases/chromadb.nix @@ -19,6 +19,12 @@ in meta.maintainers = with lib.maintainers; [ ]; + imports = [ + (lib.mkRemovedOptionModule [ "services" "chromadb" "logFile" ] '' + ChromaDB has removed the --log-path parameter that logFile relied on. + '') + ]; + options = { services.chromadb = { enable = mkEnableOption "ChromaDB, an open-source AI application database."; @@ -47,14 +53,6 @@ in ''; }; - logFile = mkOption { - type = types.path; - default = "/var/log/chromadb/chromadb.log"; - description = '' - Specifies the location of file for logging output. - ''; - }; - dbpath = mkOption { type = types.str; default = "/var/lib/chromadb"; @@ -81,7 +79,7 @@ in StateDirectory = "chromadb"; WorkingDirectory = "/var/lib/chromadb"; LogsDirectory = "chromadb"; - ExecStart = "${lib.getExe cfg.package} run --path ${cfg.dbpath} --host ${cfg.host} --port ${toString cfg.port} --log-path ${cfg.logFile}"; + ExecStart = "${lib.getExe cfg.package} run --path ${cfg.dbpath} --host ${cfg.host} --port ${toString cfg.port}"; Restart = "on-failure"; ProtectHome = true; ProtectSystem = "strict"; diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a60aca014672..ca30c830c58b 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -9,7 +9,7 @@ let cfg = config.services.mailman; inherit - (pkgs.mailmanPackages.buildEnvs { + (cfg.packageSet.buildEnvs { withHyperkitty = cfg.hyperkitty.enable; withLDAP = cfg.ldap.enable; }) @@ -117,6 +117,10 @@ in description = "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix)."; }; + packageSet = lib.mkPackageOption pkgs "mailmanPackages" { } // { + type = lib.types.attrs; + }; + ldap = { enable = lib.mkEnableOption "LDAP auth"; serverUri = lib.mkOption { @@ -348,7 +352,7 @@ in mailman.layout = "fhs"; "paths.fhs" = { - bin_dir = "${pkgs.mailmanPackages.mailman}/bin"; + bin_dir = "${cfg.packageSet.mailman}/bin"; var_dir = "/var/lib/mailman"; queue_dir = "$var_dir/queue"; template_dir = "$var_dir/templates"; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 27182bb5cca9..3ba7916dc8d5 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -123,7 +123,7 @@ in libpurple_plugins = lib.mkOption { type = lib.types.listOf lib.types.package; default = [ ]; - example = lib.literalExpression "[ pkgs.purple-matrix ]"; + example = lib.literalExpression "[ pkgs.purple-discord ]"; description = '' The list of libpurple plugins to install. ''; diff --git a/nixos/modules/services/networking/nebula.nix b/nixos/modules/services/networking/nebula.nix index 36122d45c128..81a50f60bd44 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -282,6 +282,7 @@ in Type = "notify"; Restart = "always"; ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -s HUP $MAINPID"; UMask = "0027"; CapabilityBoundingSet = capabilities; AmbientCapabilities = capabilities; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 596a015eccce..731b5c2138f7 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -44,6 +44,12 @@ in description = "Whether to disable the Taildrop feature for sending files between nodes."; }; + disableUpstreamLogging = mkOption { + default = false; + type = types.bool; + description = "Whether to disable Tailscaled from sending debug logging upstream."; + }; + package = lib.mkPackageOption pkgs "tailscale" { }; openFirewall = mkOption { @@ -154,6 +160,9 @@ in ]) ++ (lib.optionals (cfg.disableTaildrop) [ "TS_DISABLE_TAILDROP=true" + ]) + ++ (lib.optionals (cfg.disableUpstreamLogging) [ + "TS_NO_LOGS_NO_SUPPORT=true" ]); # Restart tailscaled with a single `systemctl restart` at the # end of activation, rather than a `stop` followed by a later diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index dbc41aa53523..70d3e15e6e36 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -33,12 +33,12 @@ in kmscon is a kms/dri-based userspace virtual terminal implementation. It supports a richer feature set than the standard linux console VT, including full unicode support, and when the video card supports drm - should be much faster. + should be much faster ''; package = mkPackageOption pkgs "kmscon" { }; - hwRender = mkEnableOption "3D hardware acceleration to render the console."; + hwRender = mkEnableOption "3D hardware acceleration to render the console"; fonts = mkOption { description = "Fonts used by kmscon, in order of priority."; @@ -63,7 +63,9 @@ in nullOr (nonEmptyListOf fontType); }; - useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings."; + useXkbConfig = mkEnableOption "" // { + description = "Whether to configure keymap from xserver keyboard settings."; + }; extraConfig = mkOption { description = "Extra contents of the kmscon.conf file."; diff --git a/nixos/modules/services/web-apps/ente.md b/nixos/modules/services/web-apps/ente.md new file mode 100644 index 000000000000..95763301fc3d --- /dev/null +++ b/nixos/modules/services/web-apps/ente.md @@ -0,0 +1,178 @@ +# Ente.io {#module-services-ente} + +[Ente](https://ente.io/) is a service that provides a fully open source, +end-to-end encrypted platform for photos and videos. + +## Quickstart {#module-services-ente-quickstart} + +To host ente, you need the following things: +- S3 storage server (either external or self-hosted like [minio](https://github.com/minio/minio)) +- Several subdomains pointing to your server: + - accounts.example.com + - albums.example.com + - api.example.com + - cast.example.com + - photos.example.com + - s3.example.com + +The following example shows how to setup ente with a self-hosted S3 storage via minio. +You can host the minio s3 storage on the same server as ente, but as this isn't +a requirement the example shows the minio and ente setup separately. +We assume that the minio server will be reachable at `https://s3.example.com`. + +```nix +{ + services.minio = { + enable = true; + # ente's config must match this region! + region = "us-east-1"; + # Please use a file, agenix or sops-nix to securely store your root user password! + # MINIO_ROOT_USER=your_root_user + # MINIO_ROOT_PASSWORD=a_randomly_generated_long_password + rootCredentialsFile = "/run/secrets/minio-credentials-full"; + }; + + systemd.services.minio.environment.MINIO_SERVER_URL = "https://s3.example.com"; + + # Proxy for minio + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + services.nginx = { + recommendedProxySettings = true; + virtualHosts."s3.example.com" = { + forceSSL = true; + useACME = true; + locations."/".proxyPass = "http://localhost:9000"; + # determine max file upload size + extraConfig = '' + client_max_body_size 16G; + proxy_buffering off; + proxy_request_buffering off; + ''; + }; + }; +} +``` + +And the configuration for ente: + +```nix +{ + services.ente = { + web = { + enable = true; + domains = { + accounts = "accounts.example.com"; + albums = "albums.example.com"; + cast = "cast.example.com"; + photos = "photos.example.com"; + }; + }; + api = { + enable = true; + nginx.enable = true; + # Create a local postgres database and set the necessary config in ente + enableLocalDB = true; + domain = "api.example.com"; + # You can hide secrets by setting xyz._secret = file instead of xyz = value. + # Make sure to not include any of the secrets used here directly + # in your config. They would be publicly readable in the nix store. + # Use agenix, sops-nix or an equivalent secret management solution. + settings = { + s3 = { + use_path_style_urls = true; + b2-eu-cen = { + endpoint = "https://s3.example.com"; + region = "us-east-1"; + bucket = "ente"; + key._secret = pkgs.writeText "minio_user" "minio_user"; + secret._secret = pkgs.writeText "minio_pw" "minio_pw"; + }; + }; + key = { + # generate with: openssl rand -base64 32 + encryption._secret = pkgs.writeText "encryption" "T0sn+zUVFOApdX4jJL4op6BtqqAfyQLH95fu8ASWfno="; + # generate with: openssl rand -base64 64 + hash._secret = pkgs.writeText "hash" "g/dBZBs1zi9SXQ0EKr4RCt1TGr7ZCKkgrpjyjrQEKovWPu5/ce8dYM6YvMIPL23MMZToVuuG+Z6SGxxTbxg5NQ=="; + }; + # generate with: openssl rand -base64 32 + jwt.secret._secret = pkgs.writeText "jwt" "i2DecQmfGreG6q1vBj5tCokhlN41gcfS2cjOs9Po-u8="; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + services.nginx = { + recommendedProxySettings = true; # This is important! + virtualHosts."accounts.${domain}".enableACME = true; + virtualHosts."albums.${domain}".enableACME = true; + virtualHosts."api.${domain}".enableACME = true; + virtualHosts."cast.${domain}".enableACME = true; + virtualHosts."photos.${domain}".enableACME = true; + }; +} +``` + +If you have a mail server or smtp relay, you can optionally configure +`services.ente.api.settings.smtp` so ente can send you emails (registration code and possibly +other events). This is optional. + +After starting the minio server, make sure the bucket exists: + +``` +mc alias set minio https://s3.example.com root_user root_password --api s3v4 +mc mb -p minio/ente +``` + +Now ente should be ready to go under `https://photos.example.com`. + +## Registering users {#module-services-ente-registering-users} + +Now you can open photos.example.com and register your user(s). +Beware that the first created account will be considered to be the admin account, +which among some other things allows you to use `ente-cli` to increase storage limits for any user. + +If you have configured smtp, you will get a mail with a verification code, +otherwise you can find the code in the server logs. + +``` +journalctl -eu ente +[...] +ente # [ 157.145165] ente[982]: INFO[0141]email.go:130 sendViaTransmail Skipping sending email to a@a.a: Verification code: 134033 +``` + +After you have registered your users, you can set +`settings.internal.disable-registration = true;` to prevent +further signups. + +## Increasing storage limit {#module-services-ente-increasing-storage-limit} + +By default, all users will be on the free plan which is the only plan +available. While adding new plans is possible in theory, it requires some +manual database operations which isn't worthwhile. Instead, use `ente-cli` +with your admin user to modify the storage limit. + +## iOS background sync + +On iOS, background sync is achived via a silent notification sent by the server +every 30 minutes that allows the phone to sync for about 30 seconds, enough for +all but the largest videos to be synced on background (if the app is brought to +foreground though, sync will resume as normal). To achive this however, a +Firebase account is needed. In the settings option, configure credentials-dir +to point towards the directory where the JSON containing the Firebase +credentials are stored. + +```nix +{ + # This directory should contain your fcm-service-account.json file + services.ente.api.settings = { + credentials-dir = "/path/to/credentials"; + # [...] + }; +} +``` diff --git a/nixos/modules/services/web-apps/ente.nix b/nixos/modules/services/web-apps/ente.nix new file mode 100644 index 000000000000..d36c1f9555b4 --- /dev/null +++ b/nixos/modules/services/web-apps/ente.nix @@ -0,0 +1,363 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: +let + inherit (lib) + getExe + mkDefault + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOption + optional + types + ; + + cfgApi = config.services.ente.api; + cfgWeb = config.services.ente.web; + + webPackage = + enteApp: + cfgWeb.package.override { + inherit enteApp; + enteMainUrl = "https://${cfgWeb.domains.photos}"; + extraBuildEnv = { + NEXT_PUBLIC_ENTE_ENDPOINT = "https://${cfgWeb.domains.api}"; + NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT = "https://${cfgWeb.domains.albums}"; + NEXT_TELEMETRY_DISABLED = "1"; + }; + }; + + defaultUser = "ente"; + defaultGroup = "ente"; + dataDir = "/var/lib/ente"; + + yamlFormat = pkgs.formats.yaml { }; +in +{ + options.services.ente = { + web = { + enable = mkEnableOption "Ente web frontend (Photos, Albums)"; + package = mkPackageOption pkgs "ente-web" { }; + + domains = { + api = mkOption { + type = types.str; + example = "api.ente.example.com"; + description = '' + The domain under which the api is served. This will NOT serve the api itself, + but is a required setting to host the frontends! This will automatically be set + for you if you enable both the api server and web frontends. + ''; + }; + + accounts = mkOption { + type = types.str; + example = "accounts.ente.example.com"; + description = "The domain under which the accounts frontend will be served."; + }; + + cast = mkOption { + type = types.str; + example = "cast.ente.example.com"; + description = "The domain under which the cast frontend will be served."; + }; + + albums = mkOption { + type = types.str; + example = "albums.ente.example.com"; + description = "The domain under which the albums frontend will be served."; + }; + + photos = mkOption { + type = types.str; + example = "photos.ente.example.com"; + description = "The domain under which the photos frontend will be served."; + }; + }; + }; + + api = { + enable = mkEnableOption "Museum (API server for ente.io)"; + package = mkPackageOption pkgs "museum" { }; + nginx.enable = mkEnableOption "nginx proxy for the API server"; + + user = mkOption { + type = types.str; + default = defaultUser; + description = "User under which museum runs. If you set this option you must make sure the user exists."; + }; + + group = mkOption { + type = types.str; + default = defaultGroup; + description = "Group under which museum runs. If you set this option you must make sure the group exists."; + }; + + domain = mkOption { + type = types.str; + example = "api.ente.example.com"; + description = "The domain under which the api will be served."; + }; + + enableLocalDB = mkEnableOption "the automatic creation of a local postgres database for museum."; + + settings = mkOption { + description = '' + Museum yaml configuration. Refer to upstream [local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml) for more information. + You can specify secret values in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly. + ''; + default = { }; + type = types.submodule { + freeformType = yamlFormat.type; + options = { + apps = { + public-albums = mkOption { + type = types.str; + default = "https://albums.ente.io"; + description = '' + If you're running a self hosted instance and wish to serve public links, + set this to the URL where your albums web app is running. + ''; + }; + + cast = mkOption { + type = types.str; + default = "https://cast.ente.io"; + description = '' + Set this to the URL where your cast page is running. + This is for browser and chromecast casting support. + ''; + }; + + accounts = mkOption { + type = types.str; + default = "https://accounts.ente.io"; + description = '' + Set this to the URL where your accounts page is running. + This is primarily for passkey support. + ''; + }; + }; + + db = { + host = mkOption { + type = types.str; + description = "The database host"; + }; + + port = mkOption { + type = types.port; + default = 5432; + description = "The database port"; + }; + + name = mkOption { + type = types.str; + description = "The database name"; + }; + + user = mkOption { + type = types.str; + description = "The database user"; + }; + }; + }; + }; + }; + }; + }; + + config = mkMerge [ + (mkIf cfgApi.enable { + services.postgresql = mkIf cfgApi.enableLocalDB { + enable = true; + ensureUsers = [ + { + name = "ente"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ "ente" ]; + }; + + services.ente.web.domains.api = mkIf cfgWeb.enable cfgApi.domain; + services.ente.api.settings = { + # This will cause logs to be written to stdout/err, which then end up in the journal + log-file = mkDefault ""; + db = mkIf cfgApi.enableLocalDB { + host = "/run/postgresql"; + port = 5432; + name = "ente"; + user = "ente"; + }; + }; + + systemd.services.ente = { + description = "Ente.io Museum API Server"; + after = [ "network.target" ] ++ optional cfgApi.enableLocalDB "postgresql.service"; + requires = optional cfgApi.enableLocalDB "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + # Generate config including secret values. YAML is a superset of JSON, so we can use this here. + ${utils.genJqSecretsReplacementSnippet cfgApi.settings "/run/ente/local.yaml"} + + # Setup paths + mkdir -p ${dataDir}/configurations + ln -sTf /run/ente/local.yaml ${dataDir}/configurations/local.yaml + ''; + + serviceConfig = { + ExecStart = getExe cfgApi.package; + Type = "simple"; + Restart = "on-failure"; + + AmbientCapablities = [ ]; + CapabilityBoundingSet = [ ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = false; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + UMask = "077"; + + BindReadOnlyPaths = [ + "${cfgApi.package}/share/museum/migrations:${dataDir}/migrations" + "${cfgApi.package}/share/museum/mail-templates:${dataDir}/mail-templates" + "${cfgApi.package}/share/museum/web-templates:${dataDir}/web-templates" + ]; + + User = cfgApi.user; + Group = cfgApi.group; + + SyslogIdentifier = "ente"; + StateDirectory = "ente"; + WorkingDirectory = dataDir; + RuntimeDirectory = "ente"; + }; + + # Environment MUST be called local, otherwise we cannot log to stdout + environment = { + ENVIRONMENT = "local"; + GIN_MODE = "release"; + }; + }; + + users = { + users = mkIf (cfgApi.user == defaultUser) { + ${defaultUser} = { + description = "ente.io museum service user"; + inherit (cfgApi) group; + isSystemUser = true; + home = dataDir; + }; + }; + groups = mkIf (cfgApi.group == defaultGroup) { ${defaultGroup} = { }; }; + }; + + services.nginx = mkIf cfgApi.nginx.enable { + enable = true; + upstreams.museum = { + servers."localhost:8080" = { }; + extraConfig = '' + zone museum 64k; + keepalive 20; + ''; + }; + + virtualHosts.${cfgApi.domain} = { + forceSSL = mkDefault true; + locations."/".proxyPass = "http://museum"; + extraConfig = '' + client_max_body_size 4M; + ''; + }; + }; + }) + (mkIf cfgWeb.enable { + services.ente.api.settings = mkIf cfgApi.enable { + apps = { + accounts = "https://${cfgWeb.domains.accounts}"; + cast = "https://${cfgWeb.domains.cast}"; + public-albums = "https://${cfgWeb.domains.albums}"; + }; + + webauthn = { + rpid = cfgWeb.domains.accounts; + rporigins = [ "https://${cfgWeb.domains.accounts}" ]; + }; + }; + + services.nginx = + let + domainFor = app: cfgWeb.domains.${app}; + in + { + enable = true; + virtualHosts.${domainFor "accounts"} = { + forceSSL = mkDefault true; + locations."/" = { + root = webPackage "accounts"; + tryFiles = "$uri $uri.html /index.html"; + extraConfig = '' + add_header Access-Control-Allow-Origin 'https://${cfgWeb.domains.api}'; + ''; + }; + }; + virtualHosts.${domainFor "cast"} = { + forceSSL = mkDefault true; + locations."/" = { + root = webPackage "cast"; + tryFiles = "$uri $uri.html /index.html"; + extraConfig = '' + add_header Access-Control-Allow-Origin 'https://${cfgWeb.domains.api}'; + ''; + }; + }; + virtualHosts.${domainFor "photos"} = { + serverAliases = [ + (domainFor "albums") # the albums app is shared with the photos frontend + ]; + forceSSL = mkDefault true; + locations."/" = { + root = webPackage "photos"; + tryFiles = "$uri $uri.html /index.html"; + extraConfig = '' + add_header Access-Control-Allow-Origin 'https://${cfgWeb.domains.api}'; + ''; + }; + }; + }; + }) + ]; + + meta.maintainers = with lib.maintainers; [ oddlama ]; +} diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index cbe0175ac57a..6cd51efbf60a 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -1080,7 +1080,7 @@ in proxyWebsockets = true; }; - locations."/api/v1/streaming/" = { + locations."/api/v1/streaming" = { proxyPass = "http://mastodon-streaming"; proxyWebsockets = true; }; diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix index ad1aad4216ef..d27f476a59b8 100644 --- a/nixos/modules/virtualisation/lxc-image-metadata.nix +++ b/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -77,7 +77,7 @@ in options = { virtualisation.lxc = { templates = lib.mkOption { - description = "Templates for LXD"; + description = "Templates for LXC images"; type = lib.types.attrsOf (lib.types.submodule templateSubmodule); default = { }; example = lib.literalExpression '' diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix deleted file mode 100644 index 7b7093d6f680..000000000000 --- a/nixos/modules/virtualisation/lxd-agent.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.virtualisation.lxd.agent; - - # the lxd agent is provided by the lxd daemon through a virtiofs or 9p mount - # this is a port of the distrobuilder lxd-agent generator - # https://github.com/lxc/distrobuilder/blob/f77300bf7d7d5707b08eaf8a434d647d1ba81b5d/generators/lxd-agent.go#L18-L55 - preStartScript = '' - PREFIX="/run/lxd_agent" - - mount_virtiofs() { - mount -t virtiofs config "$PREFIX/.mnt" >/dev/null 2>&1 - } - - mount_9p() { - modprobe 9pnet_virtio >/dev/null 2>&1 || true - mount -t 9p config "$PREFIX/.mnt" -o access=0,trans=virtio,size=1048576 >/dev/null 2>&1 - } - - fail() { - umount -l "$PREFIX" >/dev/null 2>&1 || true - rmdir "$PREFIX" >/dev/null 2>&1 || true - echo "$1" - exit 1 - } - - # Setup the mount target. - umount -l "$PREFIX" >/dev/null 2>&1 || true - mkdir -p "$PREFIX" - mount -t tmpfs tmpfs "$PREFIX" -o mode=0700,size=50M - mkdir -p "$PREFIX/.mnt" - - # Try virtiofs first. - mount_virtiofs || mount_9p || fail "Couldn't mount virtiofs or 9p, failing." - - # Copy the data. - cp -Ra "$PREFIX/.mnt/"* "$PREFIX" - - # Unmount the temporary mount. - umount "$PREFIX/.mnt" - rmdir "$PREFIX/.mnt" - - # Fix up permissions. - chown -R root:root "$PREFIX" - ''; -in -{ - options = { - virtualisation.lxd.agent.enable = lib.mkEnableOption "LXD agent"; - }; - - config = lib.mkIf cfg.enable { - # https://github.com/lxc/distrobuilder/blob/f77300bf7d7d5707b08eaf8a434d647d1ba81b5d/generators/lxd-agent.go#L108-L125 - systemd.services.lxd-agent = { - enable = true; - wantedBy = [ "multi-user.target" ]; - before = [ - "shutdown.target" - ] - ++ lib.optionals config.services.cloud-init.enable [ - "cloud-init.target" - "cloud-init.service" - "cloud-init-local.service" - ]; - conflicts = [ "shutdown.target" ]; - path = [ - pkgs.kmod - pkgs.util-linux - - # allow `incus exec` to find system binaries - "/run/current-system/sw" - ]; - - preStart = preStartScript; - - # avoid killing nixos-rebuild switch when executed through lxc exec - restartIfChanged = false; - stopIfChanged = false; - - unitConfig = { - Description = "LXD - agent"; - Documentation = "https://documentation.ubuntu.com/lxd/en/latest"; - ConditionPathExists = "/dev/virtio-ports/org.linuxcontainers.lxd"; - DefaultDependencies = "no"; - StartLimitInterval = "60"; - StartLimitBurst = "10"; - }; - - serviceConfig = { - Type = "notify"; - WorkingDirectory = "-/run/lxd_agent"; - ExecStart = "/run/lxd_agent/lxd-agent"; - Restart = "on-failure"; - RestartSec = "5s"; - }; - }; - - systemd.paths.lxd-agent = { - enable = true; - wantedBy = [ "multi-user.target" ]; - pathConfig.PathExists = "/dev/virtio-ports/org.linuxcontainers.lxd"; - }; - }; -} diff --git a/nixos/modules/virtualisation/lxd-virtual-machine.nix b/nixos/modules/virtualisation/lxd-virtual-machine.nix deleted file mode 100644 index 156b69713acd..000000000000 --- a/nixos/modules/virtualisation/lxd-virtual-machine.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - serialDevice = if pkgs.stdenv.hostPlatform.isx86 then "ttyS0" else "ttyAMA0"; # aarch64 -in -{ - imports = [ - ./lxc-instance-common.nix - - ../profiles/qemu-guest.nix - ]; - - config = { - system.build.qemuImage = import ../../lib/make-disk-image.nix { - inherit pkgs lib config; - - partitionTableType = "efi"; - format = "qcow2-compressed"; - copyChannel = true; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-label/ESP"; - fsType = "vfat"; - }; - }; - - boot.growPartition = true; - boot.loader.systemd-boot.enable = true; - - # image building needs to know what device to install bootloader on - boot.loader.grub.device = "/dev/vda"; - - boot.kernelParams = [ - "console=tty1" - "console=${serialDevice}" - ]; - - services.udev.extraRules = '' - SUBSYSTEM=="cpu", CONST{arch}=="x86-64", TEST=="online", ATTR{online}=="0", ATTR{online}="1" - ''; - - virtualisation.lxd.agent.enable = lib.mkDefault true; - }; -} diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix deleted file mode 100644 index d5763a1867de..000000000000 --- a/nixos/modules/virtualisation/lxd.nix +++ /dev/null @@ -1,283 +0,0 @@ -# Systemd services for lxd. - -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.virtualisation.lxd; - preseedFormat = pkgs.formats.yaml { }; -in -{ - imports = [ - (lib.mkRemovedOptionModule [ - "virtualisation" - "lxd" - "zfsPackage" - ] "Override zfs in an overlay instead to override it globally") - ]; - - options = { - virtualisation.lxd = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - This option enables lxd, a daemon that manages - containers. Users in the "lxd" group can interact with - the daemon (e.g. to start or stop containers) using the - {command}`lxc` command line tool, among others. - - Most of the time, you'll also want to start lxcfs, so - that containers can "see" the limits: - ``` - virtualisation.lxc.lxcfs.enable = true; - ``` - ''; - }; - - package = lib.mkPackageOption pkgs "lxd-lts" { }; - - lxcPackage = lib.mkOption { - type = lib.types.package; - default = config.virtualisation.lxc.package; - defaultText = lib.literalExpression "config.virtualisation.lxc.package"; - description = "The lxc package to use."; - }; - - zfsSupport = lib.mkOption { - type = lib.types.bool; - default = config.boot.zfs.enabled; - defaultText = lib.literalExpression "config.boot.zfs.enabled"; - description = '' - Enables lxd to use zfs as a storage for containers. - - This option is enabled by default if a zfs pool is configured - with nixos. - ''; - }; - - recommendedSysctlSettings = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Enables various settings to avoid common pitfalls when - running containers requiring many file operations. - Fixes errors like "Too many open files" or - "neighbour: ndisc_cache: neighbor table overflow!". - See - for details. - ''; - }; - - preseed = lib.mkOption { - type = lib.types.nullOr ( - lib.types.submodule { - freeformType = preseedFormat.type; - } - ); - - default = null; - - description = '' - Configuration for LXD preseed, see - - for supported values. - - Changes to this will be re-applied to LXD which will overwrite existing entities or create missing ones, - but entities will *not* be removed by preseed. - ''; - - example = lib.literalExpression '' - { - networks = [ - { - name = "lxdbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.100.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "default"; - devices = { - eth0 = { - name = "eth0"; - network = "lxdbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "default"; - size = "35GiB"; - type = "disk"; - }; - }; - } - ]; - storage_pools = [ - { - name = "default"; - driver = "dir"; - config = { - source = "/var/lib/lxd/storage-pools/default"; - }; - } - ]; - } - ''; - }; - - startTimeout = lib.mkOption { - type = lib.types.int; - default = 600; - apply = toString; - description = '' - Time to wait (in seconds) for LXD to become ready to process requests. - If LXD does not reply within the configured time, lxd.service will be - considered failed and systemd will attempt to restart it. - ''; - }; - - ui = { - enable = lib.mkEnableOption "(experimental) LXD UI"; - - package = lib.mkPackageOption pkgs [ "lxd-ui" ] { }; - }; - }; - }; - - ###### implementation - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - - # Note: the following options are also declared in virtualisation.lxc, but - # the latter can't be simply enabled to reuse the formers, because it - # does a bunch of unrelated things. - systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; - - security.apparmor = { - packages = [ cfg.lxcPackage ]; - policies = { - "bin.lxc-start".profile = '' - include ${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start - ''; - "lxc-containers".profile = '' - include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers - ''; - }; - }; - - systemd.sockets.lxd = { - description = "LXD UNIX socket"; - wantedBy = [ "sockets.target" ]; - - socketConfig = { - ListenStream = "/var/lib/lxd/unix.socket"; - SocketMode = "0660"; - SocketGroup = "lxd"; - Service = "lxd.service"; - }; - }; - - systemd.services.lxd = { - description = "LXD Container Management Daemon"; - - wantedBy = [ "multi-user.target" ]; - after = [ - "network-online.target" - (lib.mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") - ]; - requires = [ - "network-online.target" - "lxd.socket" - (lib.mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") - ]; - documentation = [ "man:lxd(1)" ]; - - path = [ pkgs.util-linux ] ++ lib.optional cfg.zfsSupport config.boot.zfs.package; - - environment = lib.mkIf (cfg.ui.enable) { - "LXD_UI" = cfg.ui.package; - }; - - serviceConfig = { - ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; - ExecStartPost = "${cfg.package}/bin/lxd waitready --timeout=${cfg.startTimeout}"; - ExecStop = "${cfg.package}/bin/lxd shutdown"; - - KillMode = "process"; # when stopping, leave the containers alone - LimitMEMLOCK = "infinity"; - LimitNOFILE = "1048576"; - LimitNPROC = "infinity"; - TasksMax = "infinity"; - Delegate = true; # LXD needs to manage cgroups in its subtree - - # By default, `lxd` loads configuration files from hard-coded - # `/usr/share/lxc/config` - since this is a no-go for us, we have to - # explicitly tell it where the actual configuration files are - Environment = lib.mkIf (config.virtualisation.lxc.lxcfs.enable) "LXD_LXC_TEMPLATE_CONFIG=${pkgs.lxcfs}/share/lxc/config"; - }; - - unitConfig.ConditionPathExists = "!/var/lib/incus/.migrated-from-lxd"; - }; - - systemd.services.lxd-preseed = lib.mkIf (cfg.preseed != null) { - description = "LXD initialization with preseed file"; - wantedBy = [ "multi-user.target" ]; - requires = [ "lxd.service" ]; - after = [ "lxd.service" ]; - - script = '' - ${pkgs.coreutils}/bin/cat ${preseedFormat.generate "lxd-preseed.yaml" cfg.preseed} | ${cfg.package}/bin/lxd init --preseed - ''; - - serviceConfig = { - Type = "oneshot"; - }; - }; - - users.groups.lxd = { }; - - users.users.root = { - subUidRanges = [ - { - startUid = 1000000; - count = 65536; - } - ]; - subGidRanges = [ - { - startGid = 1000000; - count = 65536; - } - ]; - }; - - boot.kernel.sysctl = lib.mkIf cfg.recommendedSysctlSettings { - "fs.inotify.max_queued_events" = 1048576; - "fs.inotify.max_user_instances" = 1048576; - "fs.inotify.max_user_watches" = 1048576; - "vm.max_map_count" = 262144; # TODO: Default vm.max_map_count has been increased system-wide - "kernel.dmesg_restrict" = 1; - "net.ipv4.neigh.default.gc_thresh3" = 8192; - "net.ipv6.neigh.default.gc_thresh3" = 8192; - "kernel.keys.maxkeys" = 2000; - }; - - boot.kernelModules = [ - "veth" - "xt_comment" - "xt_CHECKSUM" - "xt_MASQUERADE" - "vhost_vsock" - ] - ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ]; - }; -} diff --git a/nixos/release.nix b/nixos/release.nix index 207d76704b5e..f0d9c30185e5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -434,100 +434,6 @@ rec { ) ); - # An image that can be imported into lxd and used for container creation - lxdContainerImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/lxd/lxd-container-image.nix - ]; - }).config.system.build.tarball - ) - - ); - - lxdContainerImageSquashfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/lxd/lxd-container-image.nix - ]; - }).config.system.build.squashfs - ) - - ); - - # Metadata for the lxd image - lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/lxd/lxd-container-image.nix - ]; - }).config.system.build.metadata - ) - - ); - - # An image that can be imported into lxd and used for container creation - lxdVirtualMachineImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix - ]; - }).config.system.build.qemuImage - ) - - ); - - # Metadata for the lxd image - lxdVirtualMachineImageMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix - ]; - }).config.system.build.metadata - ) - - ); - # Ensure that all packages used by the minimal NixOS config end up in the channel. dummy = forAllSystems ( system: diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 46fa3160cb69..0e8bd805411e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -162,6 +162,7 @@ in lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix { }; node-name = runTest ./nixos-test-driver/node-name.nix; busybox = runTest ./nixos-test-driver/busybox.nix; + console-log = runTest ./nixos-test-driver/console-log.nix; driver-timeout = pkgs.runCommand "ensure-timeout-induced-failure" { @@ -179,10 +180,18 @@ in # NixOS vm tests and non-vm unit tests + # keep-sorted start case=no numeric=no block=yes _3proxy = runTest ./3proxy.nix; aaaaxy = runTest ./aaaaxy.nix; acme = import ./acme/default.nix { inherit runTest; }; acme-dns = runTest ./acme-dns.nix; + activation = pkgs.callPackage ../modules/system/activation/test.nix { }; + activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix; + activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix; + activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { }; + activation-nix-channel = runTest ./activation/nix-channel.nix; + activation-perlless = runTest ./activation/perlless.nix; + activation-var = runTest ./activation/var.nix; actual = runTest ./actual.nix; adguardhome = runTest ./adguardhome.nix; aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix; @@ -216,9 +225,9 @@ in anuko-time-tracker = runTest ./anuko-time-tracker.nix; apcupsd = runTest ./apcupsd.nix; apfs = runTest ./apfs.nix; + apparmor = runTest ./apparmor; appliance-repart-image = runTest ./appliance-repart-image.nix; appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix; - apparmor = runTest ./apparmor; archi = runTest ./archi.nix; aria2 = runTest ./aria2.nix; armagetronad = runTest ./armagetronad.nix; @@ -227,9 +236,8 @@ in atop = import ./atop.nix { inherit pkgs runTest; }; atticd = runTest ./atticd.nix; atuin = runTest ./atuin.nix; - ax25 = runTest ./ax25.nix; - audit = runTest ./audit.nix; audiobookshelf = runTest ./audiobookshelf.nix; + audit = runTest ./audit.nix; auth-mysql = runTest ./auth-mysql.nix; authelia = runTest ./authelia.nix; auto-cpufreq = runTest ./auto-cpufreq.nix; @@ -242,6 +250,7 @@ in imports = [ ./avahi.nix ]; _module.args.networkd = true; }; + ax25 = runTest ./ax25.nix; ayatana-indicators = runTest ./ayatana-indicators.nix; babeld = runTest ./babeld.nix; bazarr = runTest ./bazarr.nix; @@ -280,9 +289,9 @@ in bluesky-pds = runTest ./bluesky-pds.nix; bookstack = runTest ./bookstack.nix; boot = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./boot.nix { }; - bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { }; boot-stage1 = runTest ./boot-stage1.nix; boot-stage2 = runTest ./boot-stage2.nix; + bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { }; borgbackup = runTest ./borgbackup.nix; borgmatic = runTest ./borgmatic.nix; botamusique = runTest ./botamusique.nix; @@ -303,14 +312,14 @@ in cadvisor = runTestOn [ "x86_64-linux" ] ./cadvisor.nix; cage = runTest ./cage.nix; cagebreak = runTest ./cagebreak.nix; - calibre-web = runTest ./calibre-web.nix; calibre-server = import ./calibre-server.nix { inherit pkgs runTest; }; + calibre-web = runTest ./calibre-web.nix; canaille = runTest ./canaille.nix; - castopod = runTest ./castopod.nix; cassandra = runTest { imports = [ ./cassandra.nix ]; _module.args.getPackage = pkgs: pkgs.cassandra; }; + castopod = runTest ./castopod.nix; centrifugo = runTest ./centrifugo.nix; ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix; ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix; @@ -394,31 +403,31 @@ in _module.args.enableAutologin = true; _module.args.enableXWayland = true; }; - cosmic-noxwayland = runTest { - imports = [ ./cosmic.nix ]; - _module.args.testName = "cosmic-noxwayland"; - _module.args.enableAutologin = false; - _module.args.enableXWayland = false; - }; cosmic-autologin-noxwayland = runTest { imports = [ ./cosmic.nix ]; _module.args.testName = "cosmic-autologin-noxwayland"; _module.args.enableAutologin = true; _module.args.enableXWayland = false; }; + cosmic-noxwayland = runTest { + imports = [ ./cosmic.nix ]; + _module.args.testName = "cosmic-noxwayland"; + _module.args.enableAutologin = false; + _module.args.enableXWayland = false; + }; coturn = runTest ./coturn.nix; couchdb = runTest ./couchdb.nix; crabfit = runTest ./crabfit.nix; cri-o = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix; + croc = runTest ./croc.nix; + cross-seed = runTest ./cross-seed.nix; cryptpad = runTest ./cryptpad.nix; cups-pdf = runTest ./cups-pdf.nix; curl-impersonate = runTest ./curl-impersonate.nix; custom-ca = import ./custom-ca.nix { inherit pkgs runTest; }; - croc = runTest ./croc.nix; - cross-seed = runTest ./cross-seed.nix; cyrus-imap = runTest ./cyrus-imap.nix; - darling-dmg = runTest ./darling-dmg.nix; dae = runTest ./dae.nix; + darling-dmg = runTest ./darling-dmg.nix; davis = runTest ./davis.nix; db-rest = runTest ./db-rest.nix; dconf = runTest ./dconf.nix; @@ -426,6 +435,7 @@ in deconz = runTest ./deconz.nix; deluge = runTest ./deluge.nix; dendrite = runTest ./matrix/dendrite.nix; + dep-scan = runTest ./dep-scan.nix; dependency-track = runTest ./dependency-track.nix; devpi-server = runTest ./devpi-server.nix; dex-oidc = runTest ./dex-oidc.nix; @@ -443,38 +453,35 @@ in dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; doas = runTest ./doas.nix; docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix; - docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix; docker-registry = runTest ./docker-registry.nix; + docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix; docker-tools = runTestOn [ "x86_64-linux" ] ./docker-tools.nix; - docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix; docker-tools-cross = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix; + docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix; docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix; docling-serve = runTest ./docling-serve.nix; - documize = runTest ./documize.nix; documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; + documize = runTest ./documize.nix; doh-proxy-rust = runTest ./doh-proxy-rust.nix; dokuwiki = runTest ./dokuwiki.nix; dolibarr = runTest ./dolibarr.nix; domination = runTest ./domination.nix; dovecot = runTest ./dovecot.nix; - drawterm = discoverTests (import ./drawterm.nix); draupnir = runTest ./matrix/draupnir.nix; + drawterm = discoverTests (import ./drawterm.nix); drbd = runTest ./drbd.nix; + drbd-driver = runTest ./drbd-driver.nix; druid = handleTestOn [ "x86_64-linux" ] ./druid { }; drupal = runTest ./drupal.nix; - drbd-driver = runTest ./drbd-driver.nix; dublin-traceroute = runTest ./dublin-traceroute.nix; dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix; - earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; early-mount-options = runTest ./early-mount-options.nix; + earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; + easytier = runTest ./easytier.nix; ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { }; ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { }; echoip = runTest ./echoip.nix; ecryptfs = runTest ./ecryptfs.nix; - fscrypt = runTest ./fscrypt.nix; - fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; - lauti = runTest ./lauti.nix; - easytier = runTest ./easytier.nix; ejabberd = runTest ./xmpp/ejabberd.nix; elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { }; emacs-daemon = runTest ./emacs-daemon.nix; @@ -482,6 +489,7 @@ in endlessh-go = runTest ./endlessh-go.nix; engelsystem = runTest ./engelsystem.nix; enlightenment = runTest ./enlightenment.nix; + ente = runTest ./ente; env = runTest ./env.nix; envfs = runTest ./envfs.nix; envoy = runTest { @@ -496,30 +504,23 @@ in ergochat = runTest ./ergochat.nix; esphome = runTest ./esphome.nix; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; - activation = pkgs.callPackage ../modules/system/activation/test.nix { }; - activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { }; - activation-var = runTest ./activation/var.nix; - activation-nix-channel = runTest ./activation/nix-channel.nix; - activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix; - activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix; - activation-perlless = runTest ./activation/perlless.nix; etcd = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix; etcd-cluster = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix; etebase-server = runTest ./etebase-server.nix; etesync-dav = runTest ./etesync-dav.nix; - dep-scan = runTest ./dep-scan.nix; evcc = runTest ./evcc.nix; fail2ban = runTest ./fail2ban.nix; fakeroute = runTest ./fakeroute.nix; fancontrol = runTest ./fancontrol.nix; fanout = runTest ./fanout.nix; + fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; fcitx5 = runTest ./fcitx5; fedimintd = runTest ./fedimintd.nix; ferm = runTest ./ferm.nix; ferretdb = import ./ferretdb.nix { inherit pkgs runTest; }; fider = runTest ./fider.nix; - filesender = runTest ./filesender.nix; filebrowser = runTest ./filebrowser.nix; + filesender = runTest ./filesender.nix; filesystems-overlayfs = runTest ./filesystems-overlayfs.nix; firefly-iii = runTest ./firefly-iii.nix; firefly-iii-data-importer = runTest ./firefly-iii-data-importer.nix; @@ -554,8 +555,8 @@ in imports = [ ./firewall.nix ]; _module.args.nftables = true; }; - fish = runTest ./fish.nix; firezone = runTest ./firezone/firezone.nix; + fish = runTest ./fish.nix; flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix; flaresolverr = runTest ./flaresolverr.nix; flood = runTest ./flood.nix; @@ -587,9 +588,8 @@ in imports = [ ./fsck.nix ]; _module.args.systemdStage1 = true; }; + fscrypt = runTest ./fscrypt.nix; ft2-clone = runTest ./ft2-clone.nix; - legit = runTest ./legit.nix; - mimir = runTest ./mimir.nix; galene = discoverTests (import ./galene.nix { inherit runTest; }); gancio = runTest ./gancio.nix; garage_1 = import ./garage { @@ -601,11 +601,11 @@ in package = pkgs.garage_2; }; gatus = runTest ./gatus.nix; - getaddrinfo = runTest ./getaddrinfo.nix; gemstash = import ./gemstash.nix { inherit pkgs runTest; }; geoclue2 = runTest ./geoclue2.nix; geoserver = runTest ./geoserver.nix; gerrit = runTest ./gerrit.nix; + getaddrinfo = runTest ./getaddrinfo.nix; geth = runTest ./geth.nix; ghostunnel = runTest ./ghostunnel.nix; ghostunnel-modular = runTest ./ghostunnel-modular.nix; @@ -625,10 +625,10 @@ in gnome-xorg = runTest ./gnome-xorg.nix; gns3-server = runTest ./gns3-server.nix; gnupg = runTest ./gnupg.nix; - goatcounter = runTest ./goatcounter.nix; go-camo = runTest ./go-camo.nix; go-httpbin = runTest ./go-httpbin.nix; go-neb = runTest ./go-neb.nix; + goatcounter = runTest ./goatcounter.nix; gobgpd = runTest ./gobgpd.nix; gocd-agent = runTest ./gocd-agent.nix; gocd-server = runTest ./gocd-server.nix; @@ -657,61 +657,38 @@ in inherit handleTestOn; package = pkgs.hadoop; }; - hadoop_3_3 = import ./hadoop { - inherit handleTestOn; - package = pkgs.hadoop_3_3; - }; hadoop2 = import ./hadoop { inherit handleTestOn; package = pkgs.hadoop2; }; - haste-server = runTest ./haste-server.nix; + hadoop_3_3 = import ./hadoop { + inherit handleTestOn; + package = pkgs.hadoop_3_3; + }; haproxy = runTest ./haproxy.nix; hardened = runTest ./hardened.nix; harmonia = runTest ./harmonia.nix; - headscale = runTest ./headscale.nix; - healthchecks = runTest ./web-apps/healthchecks.nix; + haste-server = runTest ./haste-server.nix; hbase2 = runTest { imports = [ ./hbase.nix ]; _module.args.getPackage = pkgs: pkgs.hbase2; }; - hbase_2_5 = runTest { - imports = [ ./hbase.nix ]; - _module.args.getPackage = pkgs: pkgs.hbase_2_5; - }; - hbase_2_4 = runTest { - imports = [ ./hbase.nix ]; - _module.args.getPackage = pkgs: pkgs.hbase_2_4; - }; hbase3 = runTest { imports = [ ./hbase.nix ]; _module.args.getPackage = pkgs: pkgs.hbase3; }; + hbase_2_4 = runTest { + imports = [ ./hbase.nix ]; + _module.args.getPackage = pkgs: pkgs.hbase_2_4; + }; + hbase_2_5 = runTest { + imports = [ ./hbase.nix ]; + _module.args.getPackage = pkgs: pkgs.hbase_2_5; + }; + headscale = runTest ./headscale.nix; + healthchecks = runTest ./web-apps/healthchecks.nix; hedgedoc = runTest ./hedgedoc.nix; herbstluftwm = runTest ./herbstluftwm.nix; - homebox = runTest ./homebox.nix; - homer = handleTest ./homer { }; - homepage-dashboard = runTest ./homepage-dashboard.nix; - honk = runTest ./honk.nix; - installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { }); - invidious = runTest ./invidious.nix; - iosched = runTest ./iosched.nix; - isolate = runTest ./isolate.nix; - livebook-service = runTest ./livebook-service.nix; - pyload = runTest ./pyload.nix; - oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { }; - odoo = runTest ./odoo.nix; - odoo17 = runTest { - imports = [ ./odoo.nix ]; - _module.args.package = pkgs.odoo17; - }; - odoo16 = runTest { - imports = [ ./odoo.nix ]; - _module.args.package = pkgs.odoo16; - }; - oku = runTest ./oku.nix; - oncall = runTest ./web-apps/oncall.nix; - overseerr = runTest ./overseerr.nix; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. @@ -723,19 +700,25 @@ in hledger-web = runTest ./hledger-web.nix; hockeypuck = runTest ./hockeypuck.nix; home-assistant = runTest ./home-assistant.nix; + homebox = runTest ./homebox.nix; homebridge = runTest ./homebridge.nix; + homepage-dashboard = runTest ./homepage-dashboard.nix; + homer = handleTest ./homer { }; + honk = runTest ./honk.nix; hostname = handleTest ./hostname.nix { }; hound = runTest ./hound.nix; hub = runTest ./git/hub.nix; hydra = runTest ./hydra; + i18n = runTest ./i18n.nix; i3wm = runTest ./i3wm.nix; icingaweb2 = runTest ./icingaweb2.nix; ifm = runTest ./ifm.nix; ifstate = import ./ifstate { inherit runTest; }; iftop = runTest ./iftop.nix; + image-contents = handleTest ./image-contents.nix { }; immich = runTest ./web-apps/immich.nix; - immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix; + immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; incron = runTest ./incron.nix; incus = pkgs.recurseIntoAttrs ( handleTest ./incus { @@ -754,14 +737,18 @@ in initrdNetwork = runTest ./initrd-network.nix; input-remapper = runTest ./input-remapper.nix; inspircd = runTest ./inspircd.nix; + installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { }); installer = handleTest ./installer.nix { }; installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { }; intune = runTest ./intune.nix; + invidious = runTest ./invidious.nix; invoiceplane = runTest ./invoiceplane.nix; iodine = runTest ./iodine.nix; + iosched = runTest ./iosched.nix; ipv6 = runTest ./ipv6.nix; iscsi-multipath-root = runTest ./iscsi-multipath-root.nix; iscsi-root = runTest ./iscsi-root.nix; + isolate = runTest ./isolate.nix; isso = runTest ./isso.nix; jackett = runTest ./jackett.nix; jellyfin = runTest ./jellyfin.nix; @@ -808,21 +795,23 @@ in ladybird = runTest ./ladybird.nix; languagetool = runTest ./languagetool.nix; lanraragi = runTest ./lanraragi.nix; + lasuite-docs = runTest ./web-apps/lasuite-docs.nix; + lasuite-meet = runTest ./web-apps/lasuite-meet.nix; latestKernel.login = runTest { imports = [ ./login.nix ]; _module.args.latestKernel = true; }; - lasuite-docs = runTest ./web-apps/lasuite-docs.nix; - lasuite-meet = runTest ./web-apps/lasuite-meet.nix; + lauti = runTest ./lauti.nix; lavalink = runTest ./lavalink.nix; leaps = runTest ./leaps.nix; + legit = runTest ./legit.nix; lemmy = runTest ./lemmy.nix; - libinput = runTest ./libinput.nix; lemurs = runTest ./lemurs/lemurs.nix; lemurs-wayland = runTest ./lemurs/lemurs-wayland.nix; lemurs-wayland-script = runTest ./lemurs/lemurs-wayland-script.nix; lemurs-xorg = runTest ./lemurs/lemurs-xorg.nix; lemurs-xorg-script = runTest ./lemurs/lemurs-xorg-script.nix; + libinput = runTest ./libinput.nix; librenms = runTest ./librenms.nix; libresprite = runTest ./libresprite.nix; libreswan = runTest ./libreswan.nix; @@ -836,12 +825,13 @@ in lidarr = runTest ./lidarr.nix; lightdm = runTest ./lightdm.nix; lighttpd = runTest ./lighttpd.nix; - livekit = runTest ./networking/livekit.nix; limesurvey = runTest ./limesurvey.nix; limine = import ./limine { inherit runTest; }; listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { }; litellm = runTest ./litellm.nix; litestream = runTest ./litestream.nix; + livebook-service = runTest ./livebook-service.nix; + livekit = runTest ./networking/livekit.nix; lk-jwt-service = runTest ./matrix/lk-jwt-service.nix; llama-swap = runTest ./web-servers/llama-swap.nix; lldap = runTest ./lldap.nix; @@ -850,11 +840,6 @@ in login = runTest ./login.nix; logrotate = runTest ./logrotate.nix; loki = runTest ./loki.nix; - luks = runTest ./luks.nix; - lvm2 = handleTest ./lvm2 { }; - lxc = handleTest ./lxc { }; - lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; }); - lxd-image-server = runTest ./lxd-image-server.nix; #logstash = handleTest ./logstash.nix {}; lomiri = discoverTests (import ./lomiri.nix); lomiri-calculator-app = runTest ./lomiri-calculator-app.nix; @@ -863,11 +848,15 @@ in lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; + lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix); lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix; lomiri-music-app = runTest ./lomiri-music-app.nix; - lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix); lomiri-system-settings = runTest ./lomiri-system-settings.nix; lorri = handleTest ./lorri/default.nix { }; + luks = runTest ./luks.nix; + lvm2 = handleTest ./lvm2 { }; + lxc = handleTest ./lxc { }; + lxd-image-server = runTest ./lxd-image-server.nix; lxqt = runTest ./lxqt.nix; ly = runTest ./ly.nix; maddy = discoverTests (import ./maddy { inherit handleTest; }); @@ -876,16 +865,14 @@ in magnetico = runTest ./magnetico.nix; mailcatcher = runTest ./mailcatcher.nix; mailhog = runTest ./mailhog.nix; - mailpit = runTest ./mailpit.nix; mailman = runTest ./mailman.nix; + mailpit = runTest ./mailpit.nix; man = runTest ./man.nix; mariadb-galera = handleTest ./mysql/mariadb-galera.nix { }; marytts = runTest ./marytts.nix; mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); - pixelfed = import ./web-apps/pixelfed { inherit runTestOn; }; mate = runTest ./mate.nix; mate-wayland = runTest ./mate-wayland.nix; - matter-server = runTest ./matter-server.nix; matomo = runTest ./matomo.nix; matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix; matrix-appservice-irc = runTest ./matrix/appservice-irc.nix; @@ -894,8 +881,9 @@ in matrix-synapse = runTest ./matrix/synapse.nix; matrix-synapse-workers = runTest ./matrix/synapse-workers.nix; matrix-tuwunel = runTest ./matrix/tuwunel.nix; - mautrix-discord = runTest ./matrix/mautrix-discord.nix; + matter-server = runTest ./matter-server.nix; mattermost = handleTest ./mattermost { }; + mautrix-discord = runTest ./matrix/mautrix-discord.nix; mautrix-meta-postgres = runTest ./matrix/mautrix-meta-postgres.nix; mautrix-meta-sqlite = runTest ./matrix/mautrix-meta-sqlite.nix; mealie = runTest ./mealie.nix; @@ -907,6 +895,7 @@ in merecat = runTest ./merecat.nix; metabase = runTest ./metabase.nix; mihomo = runTest ./mihomo.nix; + mimir = runTest ./mimir.nix; mindustry = runTest ./mindustry.nix; minecraft-server = runTest ./minecraft-server.nix; minidlna = runTest ./minidlna.nix; @@ -920,15 +909,14 @@ in mjolnir = runTest ./matrix/mjolnir.nix; mobilizon = runTest ./mobilizon.nix; mod_perl = runTest ./mod_perl.nix; + modular-service-etc = runTest ./modular-service-etc/test.nix; modularService = pkgs.callPackage ../modules/system/service/systemd/test.nix { inherit evalSystem; }; - modular-service-etc = runTest ./modular-service-etc/test.nix; molly-brown = runTest ./molly-brown.nix; mollysocket = runTest ./mollysocket.nix; monado = runTest ./monado.nix; monetdb = runTest ./monetdb.nix; - monica = runTest ./web-apps/monica.nix; mongodb = runTest ./mongodb.nix; mongodb-ce = runTest ( { config, ... }: @@ -937,24 +925,25 @@ in defaults.services.mongodb.package = config.node.pkgs.mongodb-ce; } ); + monica = runTest ./web-apps/monica.nix; moodle = runTest ./moodle.nix; moonraker = runTest ./moonraker.nix; + moosefs = runTest ./moosefs.nix; mopidy = runTest ./mopidy.nix; morph-browser = runTest ./morph-browser.nix; morty = runTest ./morty.nix; mosquitto = runTest ./mosquitto.nix; - moosefs = runTest ./moosefs.nix; movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; mpd = runTest ./mpd.nix; mpv = runTest ./mpv.nix; mtp = runTest ./mtp.nix; multipass = runTest ./multipass.nix; mumble = runTest ./mumble.nix; + munin = runTest ./munin.nix; # Fails on aarch64-linux at the PDF creation step - need to debug this on an # aarch64 machine.. musescore = runTestOn [ "x86_64-linux" ] ./musescore.nix; music-assistant = runTest ./music-assistant.nix; - munin = runTest ./munin.nix; mutableUsers = runTest ./mutable-users.nix; mycelium = runTest ./mycelium; mympd = runTest ./mympd.nix; @@ -966,7 +955,6 @@ in nagios = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix; nar-serve = runTest ./nar-serve.nix; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; - nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nat.nftables.firewall = handleTest ./nat.nix { withFirewall = true; nftables = true; @@ -975,6 +963,7 @@ in withFirewall = false; nftables = true; }; + nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nats = runTest ./nats.nix; navidrome = runTest ./navidrome.nix; nbd = runTest ./nbd.nix; @@ -988,16 +977,14 @@ in nebula = runTest ./nebula.nix; neo4j = runTest ./neo4j.nix; netbird = runTest ./netbird.nix; - netdata = runTest ./netdata.nix; - nimdow = runTest ./nimdow.nix; - nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { }; - networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; }; - networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; }; - networking.networkmanager = handleTest ./networking/networkmanager.nix { }; + netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix; netbox_4_1 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_1; }; netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; }; netbox_4_3 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_3; }; - netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix; + netdata = runTest ./netdata.nix; + networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; }; + networking.networkmanager = handleTest ./networking/networkmanager.nix { }; + networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete networkingProxy = runTest ./networking-proxy.nix; nextcloud = handleTest ./nextcloud { }; @@ -1027,19 +1014,21 @@ in nginx-unix-socket = runTest ./nginx-unix-socket.nix; nginx-variants = import ./nginx-variants.nix { inherit pkgs runTest; }; nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix; + nimdow = runTest ./nimdow.nix; nipap = runTest ./web-apps/nipap.nix; nitter = runTest ./nitter.nix; + nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { }; nix-config = runTest ./nix-config.nix; nix-ld = runTest ./nix-ld.nix; nix-misc = handleTest ./nix/misc.nix { }; - nix-upgrade = handleTest ./nix/upgrade.nix { - inherit (pkgs) nixVersions; - inherit system; - }; nix-required-mounts = runTest ./nix-required-mounts; nix-serve = runTest ./nix-serve.nix; nix-serve-ssh = runTest ./nix-serve-ssh.nix; nix-store-veritysetup = runTest ./nix-store-veritysetup.nix; + nix-upgrade = handleTest ./nix/upgrade.nix { + inherit (pkgs) nixVersions; + inherit system; + }; nixops = handleTest ./nixops/default.nix { }; nixos-generate-config = runTest ./nixos-generate-config.nix; nixos-rebuild-install-bootloader = handleTestOn [ @@ -1087,16 +1076,32 @@ in nyxt = runTest ./nyxt.nix; nzbget = runTest ./nzbget.nix; nzbhydra2 = runTest ./nzbhydra2.nix; - ocis = runTest ./ocis.nix; - oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; obs-studio = runTest ./obs-studio.nix; + oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { }; + ocis = runTest ./ocis.nix; + ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { }; + octoprint = runTest ./octoprint.nix; + oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; + odoo = runTest ./odoo.nix; + odoo16 = runTest { + imports = [ ./odoo.nix ]; + _module.args.package = pkgs.odoo16; + }; + odoo17 = runTest { + imports = [ ./odoo.nix ]; + _module.args.package = pkgs.odoo17; + }; oh-my-zsh = runTest ./oh-my-zsh.nix; + oku = runTest ./oku.nix; olivetin = runTest ./olivetin.nix; ollama = runTest ./ollama.nix; ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix; ombi = runTest ./ombi.nix; omnom = runTest ./omnom; + oncall = runTest ./web-apps/oncall.nix; + open-web-calendar = runTest ./web-apps/open-web-calendar.nix; + open-webui = runTest ./open-webui.nix; openarena = runTest ./openarena.nix; openbao = runTest ./openbao.nix; opencloud = runTest ./opencloud.nix; @@ -1107,30 +1112,25 @@ in opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix { }; opensnitch = runTest ./opensnitch.nix; openssh = runTest ./openssh.nix; - octoprint = runTest ./octoprint.nix; openstack-image-metadata = (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).metadata or { }; openstack-image-userdata = (handleTestOn [ "x86_64-linux" ] ./openstack-image.nix { }).userdata or { }; opentabletdriver = runTest ./opentabletdriver.nix; opentelemetry-collector = runTest ./opentelemetry-collector.nix; - open-web-calendar = runTest ./web-apps/open-web-calendar.nix; - ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix { }; - orthanc = runTest ./orthanc.nix; - owi = runTest ./owi.nix; - owncast = runTest ./owncast.nix; - outline = runTest ./outline.nix; - i18n = runTest ./i18n.nix; - image-contents = handleTest ./image-contents.nix { }; openvscode-server = runTest ./openvscode-server.nix; - open-webui = runTest ./open-webui.nix; openvswitch = runTest ./openvswitch.nix; optee = handleTestOn [ "aarch64-linux" ] ./optee.nix { }; orangefs = runTest ./orangefs.nix; + orthanc = runTest ./orthanc.nix; os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { }; osquery = handleTestOn [ "x86_64-linux" ] ./osquery.nix { }; osrm-backend = runTest ./osrm-backend.nix; + outline = runTest ./outline.nix; overlayfs = runTest ./overlayfs.nix; + overseerr = runTest ./overseerr.nix; + owi = runTest ./owi.nix; + owncast = runTest ./owncast.nix; oxidized = handleTest ./oxidized.nix { }; pacemaker = runTest ./pacemaker.nix; packagekit = runTest ./packagekit.nix; @@ -1141,15 +1141,15 @@ in pam-u2f = runTest ./pam/pam-u2f.nix; pam-ussh = runTest ./pam/pam-ussh.nix; pam-zfs-key = runTest ./pam/zfs-key.nix; - paretosecurity = runTest ./paretosecurity.nix; - pass-secret-service = runTest ./pass-secret-service.nix; - patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { }; pantalaimon = runTest ./matrix/pantalaimon.nix; pantheon = runTest ./pantheon.nix; pantheon-wayland = runTest ./pantheon-wayland.nix; paperless = runTest ./paperless.nix; + paretosecurity = runTest ./paretosecurity.nix; parsedmarc = handleTest ./parsedmarc { }; + pass-secret-service = runTest ./pass-secret-service.nix; password-option-override-ordering = runTest ./password-option-override-ordering.nix; + patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { }; pdns-recursor = runTest ./pdns-recursor.nix; peerflix = runTest ./peerflix.nix; peering-manager = runTest ./web-apps/peering-manager.nix; @@ -1159,8 +1159,8 @@ in pgbackrest = import ./pgbackrest { inherit runTest; }; pgbouncer = runTest ./pgbouncer.nix; pghero = runTest ./pghero.nix; - pgweb = runTest ./pgweb.nix; pgmanage = runTest ./pgmanage.nix; + pgweb = runTest ./pgweb.nix; phosh = runTest ./phosh.nix; photonvision = runTest ./photonvision.nix; photoprism = runTest ./photoprism.nix; @@ -1186,9 +1186,10 @@ in }; phylactery = runTest ./web-apps/phylactery.nix; pict-rs = runTest ./pict-rs.nix; + pihole-ftl = import ./pihole-ftl { inherit runTest; }; pingvin-share = runTest ./pingvin-share.nix; pinnwand = runTest ./pinnwand.nix; - pihole-ftl = import ./pihole-ftl { inherit runTest; }; + pixelfed = import ./web-apps/pixelfed { inherit runTestOn; }; plantuml-server = runTest ./plantuml-server.nix; plasma6 = runTest ./plasma6.nix; plausible = runTest ./plausible.nix; @@ -1216,53 +1217,54 @@ in postgres-websockets = runTest ./postgres-websockets.nix; postgresql = handleTest ./postgresql { }; postgrest = runTest ./postgrest.nix; + power-profiles-daemon = runTest ./power-profiles-daemon.nix; powerdns = runTest ./powerdns.nix; powerdns-admin = handleTest ./powerdns-admin.nix { }; - power-profiles-daemon = runTest ./power-profiles-daemon.nix; pppd = runTest ./pppd.nix; predictable-interface-names = handleTest ./predictable-interface-names.nix { }; - pretalx = runTest ./web-apps/pretalx.nix; prefect = runTest ./prefect.nix; + pretalx = runTest ./web-apps/pretalx.nix; pretix = runTest ./web-apps/pretix.nix; - printing-socket = runTest { - imports = [ ./printing.nix ]; - _module.args.socket = true; - _module.args.listenTcp = true; - }; printing-service = runTest { imports = [ ./printing.nix ]; _module.args.socket = false; _module.args.listenTcp = true; }; - printing-socket-notcp = runTest { - imports = [ ./printing.nix ]; - _module.args.socket = true; - _module.args.listenTcp = false; - }; printing-service-notcp = runTest { imports = [ ./printing.nix ]; _module.args.socket = false; _module.args.listenTcp = false; }; + printing-socket = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = true; + }; + printing-socket-notcp = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = false; + }; privatebin = runTest ./privatebin.nix; privoxy = runTest ./privoxy.nix; prometheus = import ./prometheus { inherit runTest; }; prometheus-exporters = handleTest ./prometheus-exporters.nix { }; prosody = runTest ./xmpp/prosody.nix; prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { }; - proxy = runTest ./proxy.nix; prowlarr = runTest ./prowlarr.nix; + proxy = runTest ./proxy.nix; pt2-clone = runTest ./pt2-clone.nix; - pykms = runTest ./pykms.nix; public-inbox = runTest ./public-inbox.nix; pufferpanel = runTest ./pufferpanel.nix; pulseaudio = discoverTests (import ./pulseaudio.nix); + pykms = runTest ./pykms.nix; + pyload = runTest ./pyload.nix; qbittorrent = runTest ./qbittorrent.nix; qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { }; - qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { }; - qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix; qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix; + qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { }; qemu-vm-store = runTest ./qemu-vm-store.nix; + qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix; qgis = handleTest ./qgis.nix { package = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; }; qownnotes = runTest ./qownnotes.nix; @@ -1280,8 +1282,8 @@ in rasdaemon = runTest ./rasdaemon.nix; rathole = runTest ./rathole.nix; readarr = runTest ./readarr.nix; - realm = runTest ./realm.nix; readeck = runTest ./readeck.nix; + realm = runTest ./realm.nix; rebuilderd = runTest ./rebuilderd.nix; redis = handleTest ./redis.nix { }; redlib = runTest ./redlib.nix; @@ -1291,8 +1293,8 @@ in replace-dependencies = handleTest ./replace-dependencies { }; reposilite = runTest ./reposilite.nix; restartByActivationScript = runTest ./restart-by-activation-script.nix; - restic-rest-server = runTest ./restic-rest-server.nix; restic = runTest ./restic.nix; + restic-rest-server = runTest ./restic-rest-server.nix; retroarch = runTest ./retroarch.nix; rke2 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./rke2 { }; rkvm = handleTest ./rkvm { }; @@ -1332,12 +1334,12 @@ in send = runTest ./send.nix; service-runner = runTest ./service-runner.nix; servo = runTest ./servo.nix; - shadps4 = runTest ./shadps4.nix; sftpgo = runTest ./sftpgo.nix; sfxr-qt = runTest ./sfxr-qt.nix; sgt-puzzles = runTest ./sgt-puzzles.nix; shadow = runTest ./shadow.nix; shadowsocks = handleTest ./shadowsocks { }; + shadps4 = runTest ./shadps4.nix; sharkey = runTest ./web-apps/sharkey.nix; shattered-pixel-dungeon = runTest ./shattered-pixel-dungeon.nix; shiori = runTest ./shiori.nix; @@ -1348,12 +1350,12 @@ in slimserver = runTest ./slimserver.nix; slipshow = runTest ./slipshow.nix; slurm = runTest ./slurm.nix; - snmpd = runTest ./snmpd.nix; smokeping = runTest ./smokeping.nix; snapcast = runTest ./snapcast.nix; snapper = runTest ./snapper.nix; snipe-it = runTest ./web-apps/snipe-it.nix; snips-sh = runTest ./snips-sh.nix; + snmpd = runTest ./snmpd.nix; soapui = runTest ./soapui.nix; soft-serve = runTest ./soft-serve.nix; sogo = runTest ./sogo.nix; @@ -1366,15 +1368,16 @@ in spiped = runTest ./spiped.nix; sqlite3-to-mysql = runTest ./sqlite3-to-mysql.nix; squid = runTest ./squid.nix; - sslh = handleTest ./sslh.nix { }; ssh-agent-auth = runTest ./ssh-agent-auth.nix; ssh-audit = runTest ./ssh-audit.nix; sshwifty = runTest ./web-apps/sshwifty/default.nix; + sslh = handleTest ./sslh.nix { }; sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { }; sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { }; stalwart-mail = runTest ./stalwart/stalwart-mail.nix; stargazer = runTest ./web-servers/stargazer.nix; starship = runTest ./starship.nix; + startx = import ./startx.nix { inherit pkgs runTest; }; stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { }; static-web-server = runTest ./web-servers/static-web-server.nix; step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { }; @@ -1397,13 +1400,13 @@ in sx = runTest ./sx.nix; sympa = runTest ./sympa.nix; syncthing = runTest ./syncthing.nix; - syncthing-no-settings = runTest ./syncthing-no-settings.nix; + syncthing-folders = runTest ./syncthing-folders.nix; syncthing-init = runTest ./syncthing-init.nix; syncthing-many-devices = runTest ./syncthing-many-devices.nix; - syncthing-folders = runTest ./syncthing-folders.nix; + syncthing-no-settings = runTest ./syncthing-no-settings.nix; syncthing-relay = runTest ./syncthing-relay.nix; - sysinit-reactivation = runTest ./sysinit-reactivation.nix; sysfs = runTest ./sysfs.nix; + sysinit-reactivation = runTest ./sysinit-reactivation.nix; systemd = runTest ./systemd.nix; systemd-analyze = runTest ./systemd-analyze.nix; systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { }; @@ -1411,28 +1414,29 @@ in systemd-bpf = runTest ./systemd-bpf.nix; systemd-confinement = handleTest ./systemd-confinement { }; systemd-coredump = runTest ./systemd-coredump.nix; - systemd-cryptenroll = runTest ./systemd-cryptenroll.nix; systemd-credentials-tpm2 = runTest ./systemd-credentials-tpm2.nix; + systemd-cryptenroll = runTest ./systemd-cryptenroll.nix; systemd-escaping = runTest ./systemd-escaping.nix; + systemd-homed = runTest ./systemd-homed.nix; systemd-initrd-bridge = runTest ./systemd-initrd-bridge.nix; systemd-initrd-btrfs-raid = runTest ./systemd-initrd-btrfs-raid.nix; systemd-initrd-credentials = runTest ./systemd-initrd-credentials.nix; - systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix; - systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix; systemd-initrd-luks-empty-passphrase = runTest { imports = [ ./initrd-luks-empty-passphrase.nix ]; _module.args.systemdStage1 = true; }; + systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix; + systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix; systemd-initrd-luks-password = runTest ./systemd-initrd-luks-password.nix; systemd-initrd-luks-tpm2 = runTest ./systemd-initrd-luks-tpm2.nix; systemd-initrd-luks-unl0kr = runTest ./systemd-initrd-luks-unl0kr.nix; systemd-initrd-modprobe = runTest ./systemd-initrd-modprobe.nix; systemd-initrd-networkd = import ./systemd-initrd-networkd.nix { inherit runTest; }; - systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix; systemd-initrd-networkd-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn { systemdStage1 = true; }; + systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix; systemd-initrd-shutdown = runTest { imports = [ ./systemd-shutdown.nix ]; _module.args.systemdStage1 = true; @@ -1446,6 +1450,7 @@ in systemd-journal-upload = runTest ./systemd-journal-upload.nix; systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix; systemd-machinectl = runTest ./systemd-machinectl.nix; + systemd-misc = runTest ./systemd-misc.nix; systemd-networkd = runTest ./systemd-networkd.nix; systemd-networkd-bridge = runTest ./systemd-networkd-bridge.nix; systemd-networkd-dhcpserver = runTest ./systemd-networkd-dhcpserver.nix; @@ -1462,38 +1467,35 @@ in systemd-pstore = runTest ./systemd-pstore.nix; systemd-repart = handleTest ./systemd-repart.nix { }; systemd-resolved = runTest ./systemd-resolved.nix; - systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix; systemd-shutdown = runTest ./systemd-shutdown.nix; + systemd-ssh-proxy = runTest ./systemd-ssh-proxy.nix; systemd-sysupdate = runTest ./systemd-sysupdate.nix; - systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix; systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix; + systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix; systemd-sysusers-password-option-override-ordering = runTest ./systemd-sysusers-password-option-override-ordering.nix; systemd-timesyncd = runTest ./systemd-timesyncd.nix; systemd-timesyncd-nscd-dnssec = runTest ./systemd-timesyncd-nscd-dnssec.nix; systemd-user-linger = runTest ./systemd-user-linger.nix; systemd-user-tmpfiles-rules = runTest ./systemd-user-tmpfiles-rules.nix; - systemd-misc = runTest ./systemd-misc.nix; systemd-userdbd = runTest ./systemd-userdbd.nix; - systemd-homed = runTest ./systemd-homed.nix; systemtap = handleTest ./systemtap.nix { }; - startx = import ./startx.nix { inherit pkgs runTest; }; szurubooru = handleTest ./szurubooru.nix { }; taler = handleTest ./taler { }; tandoor-recipes = runTest ./tandoor-recipes.nix; tandoor-recipes-script-name = runTest ./tandoor-recipes-script-name.nix; tang = runTest ./tang.nix; - taskserver = runTest ./taskserver.nix; taskchampion-sync-server = runTest ./taskchampion-sync-server.nix; + taskserver = runTest ./taskserver.nix; tayga = runTest ./tayga.nix; technitium-dns-server = runTest ./technitium-dns-server.nix; teeworlds = runTest ./teeworlds.nix; telegraf = runTest ./telegraf.nix; teleport = handleTest ./teleport.nix { }; teleports = runTest ./teleports.nix; - thelounge = handleTest ./thelounge.nix { }; temporal = runTest ./temporal.nix; terminal-emulators = handleTest ./terminal-emulators.nix { }; thanos = runTest ./thanos.nix; + thelounge = handleTest ./thelounge.nix { }; tiddlywiki = runTest ./tiddlywiki.nix; tigervnc = handleTest ./tigervnc.nix { }; tika = runTest ./tika.nix; @@ -1508,20 +1510,19 @@ in tomcat = runTest ./tomcat.nix; tor = runTest ./tor.nix; tpm-ek = handleTest ./tpm-ek { }; + # tracee requires bpf + tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { }; traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix; trafficserver = runTest ./trafficserver.nix; transfer-sh = runTest ./transfer-sh.nix; transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; }; transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; }; - # tracee requires bpf - tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { }; trezord = runTest ./trezord.nix; trickster = runTest ./trickster.nix; trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix; tsm-client-gui = runTest ./tsm-client-gui.nix; - ttyd = runTest ./web-servers/ttyd.nix; tt-rss = runTest ./web-apps/tt-rss.nix; - txredisapi = runTest ./txredisapi.nix; + ttyd = runTest ./web-servers/ttyd.nix; tuned = runTest ./tuned.nix; tuptime = runTest ./tuptime.nix; turbovnc-headless-server = runTest ./turbovnc-headless-server.nix; @@ -1529,6 +1530,7 @@ in tusd = runTest ./tusd/default.nix; tuxguitar = runTest ./tuxguitar.nix; twingate = runTest ./twingate.nix; + txredisapi = runTest ./txredisapi.nix; typesense = runTest ./typesense.nix; tzupdate = runTest ./tzupdate.nix; ucarp = runTest ./ucarp.nix; @@ -1538,23 +1540,23 @@ in umurmur = runTest ./umurmur.nix; unbound = runTest ./unbound.nix; unifi = runTest ./unifi.nix; - unit-php = runTest ./web-servers/unit-php.nix; unit-perl = runTest ./web-servers/unit-perl.nix; + unit-php = runTest ./web-servers/unit-php.nix; upnp.iptables = handleTest ./upnp.nix { useNftables = false; }; upnp.nftables = handleTest ./upnp.nix { useNftables = true; }; uptermd = runTest ./uptermd.nix; uptime-kuma = runTest ./uptime-kuma.nix; urn-timer = runTest ./urn-timer.nix; usbguard = runTest ./usbguard.nix; - userborn = runTest ./userborn.nix; - userborn-mutable-users = runTest ./userborn-mutable-users.nix; - userborn-immutable-users = runTest ./userborn-immutable-users.nix; - userborn-mutable-etc = runTest ./userborn-mutable-etc.nix; - userborn-immutable-etc = runTest ./userborn-immutable-etc.nix; user-activation-scripts = runTest ./user-activation-scripts.nix; user-enable-option = runTest ./user-enable-option.nix; user-expiry = runTest ./user-expiry.nix; user-home-mode = runTest ./user-home-mode.nix; + userborn = runTest ./userborn.nix; + userborn-immutable-etc = runTest ./userborn-immutable-etc.nix; + userborn-immutable-users = runTest ./userborn-immutable-users.nix; + userborn-mutable-etc = runTest ./userborn-mutable-etc.nix; + userborn-mutable-users = runTest ./userborn-mutable-users.nix; ustreamer = runTest ./ustreamer.nix; uwsgi = runTest ./uwsgi.nix; v2ray = runTest ./v2ray.nix; @@ -1591,6 +1593,7 @@ in watchdogd = runTest ./watchdogd.nix; webhook = runTest ./webhook.nix; weblate = runTest ./web-apps/weblate.nix; + wg-access-server = runTest ./wg-access-server.nix; whisparr = runTest ./whisparr.nix; whoami = runTest ./whoami.nix; whoogle-search = runTest ./whoogle-search.nix; @@ -1600,12 +1603,11 @@ in inherit pkgs runTest; inherit (pkgs) lib; }; - wg-access-server = runTest ./wg-access-server.nix; without-nix = runTest ./without-nix.nix; wmderland = runTest ./wmderland.nix; + wordpress = runTest ./wordpress.nix; workout-tracker = runTest ./workout-tracker.nix; wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; }; - wordpress = runTest ./wordpress.nix; wrappers = runTest ./wrappers.nix; writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; }; wstunnel = runTest ./wstunnel.nix; @@ -1642,4 +1644,5 @@ in zrepl = runTest ./zrepl.nix; zwave-js = runTest ./zwave-js.nix; zwave-js-ui = runTest ./zwave-js-ui.nix; + # keep-sorted end } diff --git a/nixos/tests/ente/acme.test.cert.pem b/nixos/tests/ente/acme.test.cert.pem new file mode 100644 index 000000000000..e7c82d2f73d6 --- /dev/null +++ b/nixos/tests/ente/acme.test.cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICRDCCAcqgAwIBAgIIBx6YLUwhT34wCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV +bWluaWNhIHJvb3QgY2EgNjRhYWY2MB4XDTI1MDUxMzA4NTMyMVoXDTQ1MDUxMzA4 +NTMyMVowFDESMBAGA1UEAxMJYWNtZS50ZXN0MHYwEAYHKoZIzj0CAQYFK4EEACID +YgAEcuBBV1FZ9s6D3Iz3+K07BwtcSqDOmk5WGsuL/owdeIQkT5OhqdZ+0v4TA6V3 +HLb9fyaEeZ6cG8vX4fMy6wIMi1E38o1cfiTYLjS9mU/GVN+eTsnYdUS8g7uz8p0e +C0X2o4HcMIHZMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI +KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBTNdPze2U/U7/72ULml +V/K/73d2xTB5BgNVHREEcjBwgglhY21lLnRlc3SCEmFjY291bnRzLmFjbWUudGVz +dIIQYWxidW1zLmFjbWUudGVzdIINYXBpLmFjbWUudGVzdIIOY2FzdC5hY21lLnRl +c3SCEHBob3Rvcy5hY21lLnRlc3SCDHMzLmFjbWUudGVzdDAKBggqhkjOPQQDAwNo +ADBlAjB9Eao+y/Wzy+mMw4e4P2OidFxDFv8o1jDlCN5mvXBQrlAoSKVwgkpreKsd +R/3iaacCMQC7CS3XKJVRbOtI6CjVHs7SV9fwCqJ6EaLcUjeNcigxcSRKGfG1ntl+ +bt0LubZZd+c= +-----END CERTIFICATE----- diff --git a/nixos/tests/ente/acme.test.key.pem b/nixos/tests/ente/acme.test.key.pem new file mode 100644 index 000000000000..c3b4abe92243 --- /dev/null +++ b/nixos/tests/ente/acme.test.key.pem @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDB631W2iczyfu4h/4f/ +721JKAsYRAnxLV7oYSUv9rFC+z8CPC7T74Lzmoccr0mR72WhZANiAARy4EFXUVn2 +zoPcjPf4rTsHC1xKoM6aTlYay4v+jB14hCRPk6Gp1n7S/hMDpXcctv1/JoR5npwb +y9fh8zLrAgyLUTfyjVx+JNguNL2ZT8ZU355Oydh1RLyDu7PynR4LRfY= +-----END PRIVATE KEY----- diff --git a/nixos/tests/ente/ca.cert.pem b/nixos/tests/ente/ca.cert.pem new file mode 100644 index 000000000000..a97a510bb2f6 --- /dev/null +++ b/nixos/tests/ente/ca.cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB/DCCAYKgAwIBAgIIZKr2ScoFkWAwCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV +bWluaWNhIHJvb3QgY2EgNjRhYWY2MCAXDTI1MDUxMzA4NTMyMVoYDzIxMjUwNTEz +MDg1MzIxWjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA2NGFhZjYwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAAST7GqqY2N7XW9SDHXkNOhbLMaIBTtdCpmu4AAEjRzS +/KozwcGfWf98GyMJ+t8bFg9f0mCbWrl1TVhIb3eV7k7oadJYvBNljIBnnkKgmw1b +nzIE0qbzcRWmz0m5ReFNkGCjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1Ud +DgQWBBTNdPze2U/U7/72ULmlV/K/73d2xTAfBgNVHSMEGDAWgBTNdPze2U/U7/72 +ULmlV/K/73d2xTAKBggqhkjOPQQDAwNoADBlAjBto95DikOxFmQEv/c5dCbz4eYW +dsB78N+m2nrMgx10pzOvXNkvrt/D3mUbbnZI1DMCMQDQKQ+qPUF+PdDdSc21v778 +4Sokp/5SNBUVm7CT0I7OiPTtuLc//r6SK8d9VBQArx0= +-----END CERTIFICATE----- diff --git a/nixos/tests/ente/ca.key.pem b/nixos/tests/ente/ca.key.pem new file mode 100644 index 000000000000..aacdbe5ef78d --- /dev/null +++ b/nixos/tests/ente/ca.key.pem @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCIBDkk1pfjwxBpwex2 +2izySRuBmJ4Za2aRtbnTbPevhHYs0WL8LTPID47dAt0erFihZANiAAST7GqqY2N7 +XW9SDHXkNOhbLMaIBTtdCpmu4AAEjRzS/KozwcGfWf98GyMJ+t8bFg9f0mCbWrl1 +TVhIb3eV7k7oadJYvBNljIBnnkKgmw1bnzIE0qbzcRWmz0m5ReFNkGA= +-----END PRIVATE KEY----- diff --git a/nixos/tests/ente/default.nix b/nixos/tests/ente/default.nix new file mode 100644 index 000000000000..cdc30bda0fa1 --- /dev/null +++ b/nixos/tests/ente/default.nix @@ -0,0 +1,139 @@ +{ lib, pkgs, ... }: +let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + rootCredentialsFile = pkgs.writeText "minio-credentials-full" '' + MINIO_ROOT_USER=${accessKey} + MINIO_ROOT_PASSWORD=${secretKey} + ''; + + certs = import ./snakeoil-certs.nix; + domain = certs.domain; +in +{ + name = "ente"; + meta.maintainers = [ lib.maintainers.oddlama ]; + + nodes.minio = + { ... }: + { + environment.systemPackages = [ pkgs.minio-client ]; + services.minio = { + enable = true; + inherit rootCredentialsFile; + }; + + networking.firewall.allowedTCPPorts = [ + 9000 + ]; + + systemd.services.minio.environment = { + MINIO_SERVER_URL = "https://s3.${domain}"; + }; + }; + + nodes.ente = + { + config, + nodes, + lib, + ... + }: + { + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.extraHosts = '' + ${config.networking.primaryIPAddress} accounts.${domain} albums.${domain} api.${domain} cast.${domain} photos.${domain} s3.${domain} + ''; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + + services.nginx = { + recommendedProxySettings = true; + virtualHosts = + lib.genAttrs + [ + "accounts.${domain}" + "albums.${domain}" + "api.${domain}" + "cast.${domain}" + "photos.${domain}" + ] + (_: { + sslCertificate = certs.${domain}.cert; + sslCertificateKey = certs.${domain}.key; + }) + // { + "s3.${domain}" = { + forceSSL = true; + sslCertificate = certs.${domain}.cert; + sslCertificateKey = certs.${domain}.key; + locations."/".proxyPass = "http://${nodes.minio.networking.primaryIPAddress}:9000"; + extraConfig = '' + client_max_body_size 32M; + proxy_buffering off; + proxy_request_buffering off; + ''; + }; + }; + }; + + services.ente = { + web = { + enable = true; + domains = { + accounts = "accounts.${domain}"; + albums = "albums.${domain}"; + cast = "cast.${domain}"; + photos = "photos.${domain}"; + }; + }; + api = { + enable = true; + nginx.enable = true; + enableLocalDB = true; + domain = "api.${domain}"; + settings = { + s3 = { + use_path_style_urls = true; + b2-eu-cen = { + endpoint = "https://s3.${domain}"; + region = "us-east-1"; + bucket = "ente"; + key._secret = pkgs.writeText "accesskey" accessKey; + secret._secret = pkgs.writeText "secretkey" secretKey; + }; + }; + key = { + encryption._secret = pkgs.writeText "encryption" "T0sn+zUVFOApdX4jJL4op6BtqqAfyQLH95fu8ASWfno="; + hash._secret = pkgs.writeText "hash" "g/dBZBs1zi9SXQ0EKr4RCt1TGr7ZCKkgrpjyjrQEKovWPu5/ce8dYM6YvMIPL23MMZToVuuG+Z6SGxxTbxg5NQ=="; + }; + jwt.secret._secret = pkgs.writeText "jwt" "i2DecQmfGreG6q1vBj5tCokhlN41gcfS2cjOs9Po-u8="; + }; + }; + }; + }; + + testScript = '' + minio.start() + minio.wait_for_unit("minio.service") + minio.wait_for_open_port(9000) + + # Create a test bucket on the server + minio.succeed("mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4") + minio.succeed("mc mb -p minio/ente") + + # Start ente + ente.start() + ente.wait_for_unit("ente.service") + ente.wait_for_unit("nginx.service") + + # Wait until api is up + ente.wait_until_succeeds("journalctl --since -2m --unit ente.service --grep 'We have lift-off.'", timeout=30) + # Wait until photos app is up + ente.wait_until_succeeds("curl -Ls https://photos.${domain}/ | grep -q 'Ente Photos'", timeout=30) + ''; +} diff --git a/nixos/tests/ente/generate-certs.nix b/nixos/tests/ente/generate-certs.nix new file mode 100644 index 000000000000..d0af53f82abc --- /dev/null +++ b/nixos/tests/ente/generate-certs.nix @@ -0,0 +1,36 @@ +# Minica can provide a CA key and cert, plus a key +# and cert for our fake CA server's Web Front End (WFE). +{ + pkgs ? import { }, + minica ? pkgs.minica, + mkDerivation ? pkgs.stdenv.mkDerivation, +}: +let + conf = import ./snakeoil-certs.nix; + domain = conf.domain; +in +mkDerivation { + name = "test-certs"; + buildInputs = [ + (minica.overrideAttrs (_old: { + prePatch = '' + sed -i 's_NotAfter: time.Now().AddDate(2, 0, 30),_NotAfter: time.Now().AddDate(20, 0, 0),_' main.go + ''; + })) + ]; + dontUnpack = true; + + buildPhase = '' + minica \ + --ca-key ca.key.pem \ + --ca-cert ca.cert.pem \ + --domains ${domain},accounts.${domain},albums.${domain},api.${domain},cast.${domain},photos.${domain},s3.${domain} + ''; + + installPhase = '' + mkdir -p $out + mv ca.*.pem $out/ + mv ${domain}/key.pem $out/${domain}.key.pem + mv ${domain}/cert.pem $out/${domain}.cert.pem + ''; +} diff --git a/nixos/tests/ente/snakeoil-certs.nix b/nixos/tests/ente/snakeoil-certs.nix new file mode 100644 index 000000000000..405627979fee --- /dev/null +++ b/nixos/tests/ente/snakeoil-certs.nix @@ -0,0 +1,14 @@ +let + domain = "acme.test"; +in +{ + inherit domain; + ca = { + cert = ./ca.cert.pem; + key = ./ca.key.pem; + }; + "${domain}" = { + cert = ./. + "/${domain}.cert.pem"; + key = ./. + "/${domain}.key.pem"; + }; +} diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 39e837824237..5a3b7b30a872 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -24,10 +24,6 @@ in storageLvm = true; }; - lxd-to-incus = import ./lxd-to-incus.nix { - inherit lts pkgs system; - }; - openvswitch = incusTest { inherit lts pkgs system; networkOvs = true; diff --git a/nixos/tests/incus/lxd-to-incus.nix b/nixos/tests/incus/lxd-to-incus.nix deleted file mode 100644 index db1ef4d5c6a4..000000000000 --- a/nixos/tests/incus/lxd-to-incus.nix +++ /dev/null @@ -1,119 +0,0 @@ -import ../make-test-python.nix ( - - { - pkgs, - lib, - lts ? true, - ... - }: - - let - releases = import ../../release.nix { configuration.documentation.enable = lib.mkForce false; }; - - container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; - container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; - in - { - name = "lxd-to-incus"; - - meta = { - maintainers = lib.teams.lxc.members; - }; - - nodes.machine = - { ... }: - { - virtualisation = { - diskSize = 6144; - cores = 2; - memorySize = 2048; - - lxd.enable = true; - lxd.preseed = { - networks = [ - { - name = "nixostestbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.100.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "default"; - devices = { - eth0 = { - name = "eth0"; - network = "nixostestbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "nixostest_pool"; - size = "35GiB"; - type = "disk"; - }; - }; - } - { - name = "nixos_notdefault"; - devices = { }; - } - ]; - storage_pools = [ - { - name = "nixostest_pool"; - driver = "dir"; - } - ]; - }; - - incus = { - enable = true; - package = if lts then pkgs.incus-lts else pkgs.incus; - }; - }; - networking.nftables.enable = true; - }; - - testScript = '' - def lxd_wait_for_preseed(_) -> bool: - _, output = machine.systemctl("is-active lxd-preseed.service") - return ("inactive" in output) - - def lxd_instance_is_up(_) -> bool: - status, _ = machine.execute("lxc exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running") - return status == 0 - - def incus_instance_is_up(_) -> bool: - status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running") - return status == 0 - - with machine.nested("initialize lxd and resources"): - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - retry(lxd_wait_for_preseed) - - machine.succeed("lxc image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos") - machine.succeed("lxc launch nixos container") - retry(lxd_instance_is_up) - - machine.wait_for_unit("incus.service") - - with machine.nested("run migration"): - machine.succeed("${pkgs.incus}/bin/lxd-to-incus --yes") - - with machine.nested("verify resources migrated to incus"): - machine.succeed("incus config show container") - retry(incus_instance_is_up) - machine.succeed("incus exec container -- true") - machine.succeed("incus profile show default | grep nixostestbr0") - machine.succeed("incus profile show default | grep nixostest_pool") - machine.succeed("incus profile show nixos_notdefault") - machine.succeed("incus storage show nixostest_pool") - machine.succeed("incus network show nixostestbr0") - ''; - } -) diff --git a/nixos/tests/lxc/default.nix b/nixos/tests/lxc/default.nix index 0f67010863ef..304510c610dc 100644 --- a/nixos/tests/lxc/default.nix +++ b/nixos/tests/lxc/default.nix @@ -9,8 +9,8 @@ import ../make-test-python.nix ( }; }; - lxc-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; - lxc-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + lxc-image-metadata = releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}; + lxc-image-rootfs = releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system}; in { diff --git a/nixos/tests/lxd-image-server.nix b/nixos/tests/lxd-image-server.nix index 498f17ef56a2..6b6fafbfb9be 100644 --- a/nixos/tests/lxd-image-server.nix +++ b/nixos/tests/lxd-image-server.nix @@ -1,15 +1,20 @@ { pkgs, lib, ... }: let - lxd-image = import ../release.nix { + incus-image = import ../release.nix { configuration = { # Building documentation makes the test unnecessarily take a longer time: documentation.enable = lib.mkForce false; }; }; - lxd-image-metadata = lxd-image.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; - lxd-image-rootfs = lxd-image.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + incus-image-metadata = + incus-image.incusContainerMeta.${pkgs.stdenv.hostPlatform.system} + + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz"; + + incus-image-rootfs = + incus-image.incusContainerImage.${pkgs.stdenv.hostPlatform.system} + + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs"; in { @@ -31,10 +36,12 @@ in memorySize = 2048; diskSize = 4096; - lxc.lxcfs.enable = true; - lxd.enable = true; + incus.enable = true; }; + # incus requires + networking.nftables.enable = true; + security.pki.certificates = [ (builtins.readFile ./common/acme/server/ca.cert.pem) ]; @@ -64,37 +71,29 @@ in testScript = '' machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - machine.wait_for_file("/var/lib/lxd/unix.socket") + machine.wait_for_unit("incus.service") - # Wait for lxd to settle - machine.succeed("lxd waitready") - - # lxd expects the pool's directory to already exist - machine.succeed("mkdir /var/lxd-pool") + machine.succeed("incus admin waitready") + machine.succeed("incus admin init --minimal") machine.succeed( - "lxd init --minimal" - ) - - machine.succeed( - "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos" + "incus image import ${incus-image-metadata} ${incus-image-rootfs} --alias nixos" ) loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1" with subtest("push image to server"): - machine.succeed("lxc launch nixos test") + machine.succeed("incus launch nixos test") machine.sleep(5) - machine.succeed("lxc stop -f test") - machine.succeed("lxc publish --public test --alias=testimg") - machine.succeed("lxc image export testimg") + machine.succeed("incus stop -f test") + machine.succeed("incus publish --public test --alias=testimg") + machine.succeed("incus image export testimg") machine.succeed("ls >&2") machine.succeed("mkdir -p " + loc) machine.succeed("mv *.tar.gz " + loc) with subtest("pull image from server"): - machine.succeed("lxc remote add img https://acme.test --protocol=simplestreams") - machine.succeed("lxc image list img: >&2") + machine.succeed("incus remote add img https://acme.test --protocol=simplestreams") + machine.succeed("incus image list img: >&2") ''; } diff --git a/nixos/tests/lxd/container.nix b/nixos/tests/lxd/container.nix deleted file mode 100644 index d5506194cfa4..000000000000 --- a/nixos/tests/lxd/container.nix +++ /dev/null @@ -1,133 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - - let - releases = import ../../release.nix { - configuration = { - # Building documentation makes the test unnecessarily take a longer time: - documentation.enable = lib.mkForce false; - - # Our tests require `grep` & friends: - environment.systemPackages = with pkgs; [ busybox ]; - }; - }; - - lxd-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; - lxd-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; - lxd-image-rootfs-squashfs = releases.lxdContainerImageSquashfs.${pkgs.stdenv.hostPlatform.system}; - - in - { - name = "lxd-container"; - - nodes.machine = - { lib, ... }: - { - virtualisation = { - diskSize = 6144; - - # Since we're testing `limits.cpu`, we've gotta have a known number of - # cores to lean on - cores = 2; - - # Ditto, for `limits.memory` - memorySize = 512; - - lxc.lxcfs.enable = true; - lxd.enable = true; - }; - }; - - testScript = '' - def instance_is_up(_) -> bool: - status, _ = machine.execute("lxc exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") - return status == 0 - - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - machine.wait_for_file("/var/lib/lxd/unix.socket") - - # Wait for lxd to settle - machine.succeed("lxd waitready") - - # no preseed should mean no service - machine.fail("systemctl status lxd-preseed.service") - - machine.succeed("lxd init --minimal") - - machine.succeed( - "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos" - ) - - with subtest("Container can be managed"): - machine.succeed("lxc launch nixos container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") - machine.succeed("lxc delete -f container") - - with subtest("Squashfs image is functional"): - machine.succeed( - "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs-squashfs}/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs --alias nixos-squashfs" - ) - machine.succeed("lxc launch nixos-squashfs container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") - machine.succeed("lxc delete -f container") - - with subtest("Container is mounted with lxcfs inside"): - machine.succeed("lxc launch nixos container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - ## ---------- ## - ## limits.cpu ## - - machine.succeed("lxc config set container limits.cpu 1") - machine.succeed("lxc restart container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - assert ( - "1" - == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip() - ) - - machine.succeed("lxc config set container limits.cpu 2") - machine.succeed("lxc restart container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - assert ( - "2" - == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip() - ) - - ## ------------- ## - ## limits.memory ## - - machine.succeed("lxc config set container limits.memory 64MB") - machine.succeed("lxc restart container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - assert ( - "MemTotal: 62500 kB" - == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip() - ) - - machine.succeed("lxc config set container limits.memory 128MB") - machine.succeed("lxc restart container") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - assert ( - "MemTotal: 125000 kB" - == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip() - ) - - machine.succeed("lxc delete -f container") - ''; - } -) diff --git a/nixos/tests/lxd/default.nix b/nixos/tests/lxd/default.nix deleted file mode 100644 index 8e8b073bdda6..000000000000 --- a/nixos/tests/lxd/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, - handleTestOn, -}: -{ - container = import ./container.nix { inherit system pkgs; }; - nftables = import ./nftables.nix { inherit system pkgs; }; - preseed = import ./preseed.nix { inherit system pkgs; }; - ui = import ./ui.nix { inherit system pkgs; }; - virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { inherit system pkgs; }; -} diff --git a/nixos/tests/lxd/nftables.nix b/nixos/tests/lxd/nftables.nix deleted file mode 100644 index 4e68a27e9f11..000000000000 --- a/nixos/tests/lxd/nftables.nix +++ /dev/null @@ -1,51 +0,0 @@ -# This test makes sure that lxd stops implicitly depending on iptables when -# user enabled nftables. -# -# It has been extracted from `lxd.nix` for clarity, and because switching from -# iptables to nftables requires a full reboot, which is a bit hard inside NixOS -# tests. - -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "lxd-nftables"; - - nodes.machine = - { lib, ... }: - { - virtualisation = { - lxd.enable = true; - }; - - networking = { - firewall.enable = false; - nftables.enable = true; - nftables.tables."filter".family = "inet"; - nftables.tables."filter".content = '' - chain incoming { - type filter hook input priority 0; - policy accept; - } - - chain forward { - type filter hook forward priority 0; - policy accept; - } - - chain output { - type filter hook output priority 0; - policy accept; - } - ''; - }; - }; - - testScript = '' - machine.wait_for_unit("network.target") - - with subtest("When nftables are enabled, lxd doesn't depend on iptables anymore"): - machine.succeed("lsmod | grep nf_tables") - machine.fail("lsmod | grep ip_tables") - ''; - } -) diff --git a/nixos/tests/lxd/preseed.nix b/nixos/tests/lxd/preseed.nix deleted file mode 100644 index 5214da911709..000000000000 --- a/nixos/tests/lxd/preseed.nix +++ /dev/null @@ -1,71 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - - { - name = "lxd-preseed"; - - nodes.machine = - { lib, ... }: - { - virtualisation = { - diskSize = 4096; - - lxc.lxcfs.enable = true; - lxd.enable = true; - - lxd.preseed = { - networks = [ - { - name = "nixostestbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.100.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "nixostest_default"; - devices = { - eth0 = { - name = "eth0"; - network = "nixostestbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "default"; - size = "35GiB"; - type = "disk"; - }; - }; - } - ]; - storage_pools = [ - { - name = "nixostest_pool"; - driver = "dir"; - } - ]; - }; - }; - }; - - testScript = '' - def wait_for_preseed(_) -> bool: - _, output = machine.systemctl("is-active lxd-preseed.service") - return ("inactive" in output) - - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - with machine.nested("Waiting for preseed to complete"): - retry(wait_for_preseed) - - with subtest("Verify preseed resources created"): - machine.succeed("lxc profile show nixostest_default") - machine.succeed("lxc network info nixostestbr0") - machine.succeed("lxc storage show nixostest_pool") - ''; - } -) diff --git a/nixos/tests/lxd/ui.nix b/nixos/tests/lxd/ui.nix deleted file mode 100644 index 16fe96ea0870..000000000000 --- a/nixos/tests/lxd/ui.nix +++ /dev/null @@ -1,74 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, ... }: - { - name = "lxd-ui"; - - nodes.machine = - { lib, ... }: - { - virtualisation = { - lxd.enable = true; - lxd.ui.enable = true; - }; - - environment.systemPackages = - let - seleniumScript = - pkgs.writers.writePython3Bin "selenium-script" - { - libraries = with pkgs.python3Packages; [ selenium ]; - } - '' - from selenium import webdriver - from selenium.webdriver.common.by import By - from selenium.webdriver.firefox.options import Options - from selenium.webdriver.support.ui import WebDriverWait - - options = Options() - options.add_argument("--headless") - service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 - - driver = webdriver.Firefox(options=options, service=service) - driver.implicitly_wait(10) - driver.get("https://localhost:8443/ui") - - wait = WebDriverWait(driver, 60) - - assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0 - assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0 - - driver.close() - ''; - in - with pkgs; - [ - curl - firefox-unwrapped - geckodriver - seleniumScript - ]; - }; - - testScript = '' - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - machine.wait_for_file("/var/lib/lxd/unix.socket") - - # Wait for lxd to settle - machine.succeed("lxd waitready") - - # Configure LXC listen address - machine.succeed("lxc config set core.https_address :8443") - machine.succeed("systemctl restart lxd") - - # Check that the LXD_UI environment variable is populated in the systemd unit - machine.succeed("cat /etc/systemd/system/lxd.service | grep 'LXD_UI'") - - # Ensure the endpoint returns an HTML page with 'LXD UI' in the title - machine.succeed("curl -kLs https://localhost:8443/ui | grep 'LXD UI'") - - # Ensure the application is actually rendered by the Javascript - machine.succeed("PYTHONUNBUFFERED=1 selenium-script") - ''; - } -) diff --git a/nixos/tests/lxd/virtual-machine.nix b/nixos/tests/lxd/virtual-machine.nix deleted file mode 100644 index feebe3833e71..000000000000 --- a/nixos/tests/lxd/virtual-machine.nix +++ /dev/null @@ -1,65 +0,0 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - - let - releases = import ../../release.nix { - configuration = { - # Building documentation makes the test unnecessarily take a longer time: - documentation.enable = lib.mkForce false; - - # Our tests require `grep` & friends: - environment.systemPackages = with pkgs; [ busybox ]; - }; - }; - - lxd-image-metadata = releases.lxdVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system}; - lxd-image-disk = releases.lxdVirtualMachineImage.${pkgs.stdenv.hostPlatform.system}; - - instance-name = "instance1"; - in - { - name = "lxd-virtual-machine"; - - nodes.machine = - { lib, ... }: - { - virtualisation = { - diskSize = 4096; - - cores = 2; - - # Ensure we have enough memory for the nested virtual machine - memorySize = 1024; - - lxc.lxcfs.enable = true; - lxd.enable = true; - }; - }; - - testScript = '' - def instance_is_up(_) -> bool: - status, _ = machine.execute("lxc exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/true") - return status == 0 - - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - machine.wait_for_file("/var/lib/lxd/unix.socket") - - # Wait for lxd to settle - machine.succeed("lxd waitready") - - machine.succeed("lxd init --minimal") - - with subtest("virtual-machine image can be imported"): - machine.succeed("lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-disk}/nixos.qcow2 --alias nixos") - - with subtest("virtual-machine can be launched and become available"): - machine.succeed("lxc launch nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") - with machine.nested("Waiting for instance to start and be usable"): - retry(instance_is_up) - - with subtest("lxd-agent is started"): - machine.succeed("lxc exec ${instance-name} systemctl is-active lxd-agent") - ''; - } -) diff --git a/nixos/tests/nixos-test-driver/console-log.nix b/nixos/tests/nixos-test-driver/console-log.nix new file mode 100644 index 000000000000..5fc8a5e8ae78 --- /dev/null +++ b/nixos/tests/nixos-test-driver/console-log.nix @@ -0,0 +1,117 @@ +# Run with: nix-build -A nixosTests.nixos-test-driver.console-log +{ + name = "nixos-test-driver.console-log"; + + nodes = { + machine = { + # Configure the machine to print some distinctive messages to console + boot.kernelParams = [ "console=ttyS0,115200n8" ]; + + # TODO: add a system service that logs to /dev/console, and test that + # blocked on https://github.com/NixOS/nixpkgs/issues/442382 + }; + }; + + testScript = '' + # Start the machine and wait for it to boot + machine.start() + machine.wait_for_unit("multi-user.target") + + with subtest("get_console_log returns console output"): + # Get the console log + console_log = machine.get_console_log() + # Verify it's a non-empty string + assert isinstance(console_log, str), f"Expected string, got {type(console_log)}" + assert len(console_log) > 0, "Console log should not be empty" + + print(f"Console log length: {len(console_log)} characters") + print("Console log preview (first 500 chars):") + print(console_log[:500]) + + with subtest("console log contains boot messages"): + # Check for typical boot messages + assert "systemd" in console_log, "Console log should contain systemd messages" + + # Test direct stderr capture + machine.succeed("echo 'DIRECT_TEST_MESSAGE_12345' >&2") + import time + time.sleep(1) + + updated_log = machine.get_console_log() + assert "DIRECT_TEST_MESSAGE_12345" in updated_log, "Console log should capture stderr messages" + print("Successfully captured stderr message in console log") + + with subtest("console log captures command output"): + # Execute a command that prints to console via kernel messages + machine.succeed("echo 'KERNEL_TEST_MESSAGE_12345' > /dev/kmsg") + + # Wait a moment for the message to be captured + import time + time.sleep(2) + + # Get updated console log + updated_log = machine.get_console_log() + if "KERNEL_TEST_MESSAGE_12345" in updated_log: + print("Successfully captured kernel message in console log") + else: + print("Kernel message not found in console log - this may be expected depending on log level") + + with subtest("console log persists across multiple calls"): + # Get console log twice and verify they're consistent + log1 = machine.get_console_log() + log2 = machine.get_console_log() + + # Both logs should contain the same content (log2 might have additional content) + assert "systemd" in log1, "First log should contain systemd messages" + assert "systemd" in log2, "Second log should contain systemd messages" + assert len(log2) >= len(log1), "Second log should be at least as long as first log" + assert "KERNEL_TEST_MESSAGE_12345" in log2, "Second log should contain our kernel test message" + + with subtest("console log contains kernel messages"): + # Look for typical kernel boot messages + kernel_indicators = ["Linux version", "Command line:", "Kernel command line"] + kernel_found = any(indicator in console_log for indicator in kernel_indicators) + assert kernel_found, f"Console log should contain kernel messages. Indicators checked: {kernel_indicators}" + + with subtest("console log is cleared on machine restart"): + # Get the current console log and verify it contains our test messages + pre_shutdown_log = machine.get_console_log() + assert "KERNEL_TEST_MESSAGE_12345" in pre_shutdown_log, "Pre-shutdown log should contain our kernel test message" + assert "DIRECT_TEST_MESSAGE_12345" in pre_shutdown_log, "Pre-shutdown log should contain our stderr test message" + pre_shutdown_length = len(pre_shutdown_log) + print(f"Pre-shutdown console log length: {pre_shutdown_length} characters") + + # Shutdown the machine + machine.shutdown() + + # Start the machine again + machine.start() + machine.wait_for_unit("multi-user.target") + + # Get the console log after restart + post_restart_log = machine.get_console_log() + post_restart_length = len(post_restart_log) + print(f"Post-restart console log length: {post_restart_length} characters") + + # Verify the old messages are gone (log should be fresh) + assert "KERNEL_TEST_MESSAGE_12345" not in post_restart_log, "Post-restart log should not contain old kernel test message" + assert "DIRECT_TEST_MESSAGE_12345" not in post_restart_log, "Post-restart log should not contain old stderr test message" + + # Verify we still have boot messages (log should contain new boot sequence) + assert "systemd" in post_restart_log, "Post-restart log should contain systemd messages from new boot" + kernel_found_restart = any(indicator in post_restart_log for indicator in kernel_indicators) + assert kernel_found_restart, "Post-restart log should contain kernel messages from new boot" + + # Add a new test message to verify the log is working after restart + machine.succeed("echo 'POST_RESTART_TEST_MESSAGE_67890' > /dev/kmsg") + import time + time.sleep(1) + + final_log = machine.get_console_log() + assert "POST_RESTART_TEST_MESSAGE_67890" in final_log, "Should capture new messages after restart" + + print("Console log successfully cleared on restart and is functional again") + + print("All console log tests passed successfully!") + ''; +} diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index e24788a556f4..cc46b3edcb48 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.3.0"; - hash = "sha256-cw3wcMr8QKG75VofIsAmlD2RqN/0fGdqhugen/vmJlo="; + version = "25.3.2"; + hash = "sha256-xX1vejS8zoidcI6fnp7vvtSw4rMHIe2IF4JQJB5hvqs="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 0088761067f5..3bd38b53efde 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "1.90.0"; - hash = "sha256-9z8EB5jMtpmQadbX0usWUlbs/n87wX9dJcyrveKqyJ8="; + version = "1.93.0"; + hash = "sha256-Jj8Sj9UrTZVwejbinwxuRt4sZ58vsYlBHhqHkTWjNPM="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 43cbdb3fddd8..341813a0eb2d 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -1,25 +1,15 @@ { lib, vscode-utils, - claude-code, }: -vscode-utils.buildVscodeExtension (finalAttrs: { - pname = "claude-code"; - inherit (claude-code) version; - vscodeExtPublisher = "anthropic"; - vscodeExtName = "claude-code"; - vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}"; - - src = "${claude-code}/lib/node_modules/@anthropic-ai/claude-code/vendor/claude-code.vsix"; - - unpackPhase = '' - runHook preUnpack - - unzip $src - - runHook postUnpack - ''; +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "claude-code"; + publisher = "anthropic"; + version = "1.0.112"; + hash = "sha256-xQvw68PW+JjCxmILZBA/XB/+Qy1hTfBRxX3PI3zmUb8="; + }; meta = { description = "Harness the power of Claude Code without leaving your IDE"; @@ -29,4 +19,4 @@ vscode-utils.buildVscodeExtension (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; -}) +} diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 9cbd494730ae..b46bf11bde83 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.524"; - hash = "sha256-gt6+juIwTKES0CDBxv4uVSPsp0v1RUKRQoWneDfyVJQ="; + version = "2.0.525"; + hash = "sha256-pTRyDsgxd9o8Y9p2rsZTT+uG6+mSBBM/k4nczvlYGrM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0672df8d87bf..5c5e7b2f7e4c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -279,8 +279,8 @@ let mktplcRef = { name = "icons-carbon"; publisher = "antfu"; - version = "0.2.6"; - hash = "sha256-R8eHLuebfgHaKtHPKBaaYybotluuH9WrUBpgyuIVOxc="; + version = "0.2.7"; + hash = "sha256-m9iBSHHkDsOtGQD50QDgmqzOu7EXVYZxpZCZQ/q5NWU="; }; meta = { license = lib.licenses.mit; @@ -1193,8 +1193,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.116.0"; - hash = "sha256-5T/C9o6fRLnWM7MF8ATYJMEdJgLA4ZdA4Lgjtjxh2ZE="; + version = "3.118.0"; + hash = "sha256-mjGDQslTcWnT0gQ+1l1LXR/eWc335dJljlbvSHvCxNk="; }; meta.license = lib.licenses.mit; @@ -1973,8 +1973,8 @@ let mktplcRef = { publisher = "github"; name = "vscode-pull-request-github"; - version = "0.116.1"; - hash = "sha256-qJGCY1NBCv11xzeryELG0OVZy4wQZqdcYPFadZ1tlIU="; + version = "0.116.2"; + hash = "sha256-PDX3Wpmy82MvBzr/fnPP5Y7HMKkfphJLe/Rc284Vxlc="; }; meta = { license = lib.licenses.mit; @@ -3218,8 +3218,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.25"; - hash = "sha256-aBo19JYfYa04XUFJT0Z0O4FFI74GoCPLbE06x9VmJS8="; + version = "1.3.26"; + hash = "sha256-wiRV8FQw9TPNYvsgoVy8nAvCA9eosxXTaXs7YjdoBFs="; }; meta = { license = lib.licenses.mit; @@ -3784,8 +3784,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.13.0"; - hash = "sha256-qx+2lKRx/4fS2xz9lBIQsTD5tcjTzow7WmYsHYyrfOw="; + version = "6.15.0"; + hash = "sha256-MFHOKQp1mjygjAo5moahAnQFRo01D7r78eFlM1+k998="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -4528,8 +4528,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.298.0"; - hash = "sha256-zzsoVOiSgA5W88YuWVHILdHN/PuWaQAXjZ0eUL9B9ZI="; + version = "3.314.1"; + hash = "sha256-KWXQY4HyK7s4mNGh6x1eDK6okC5rxWe916RjlsACQxA="; }; meta = { license = lib.licenses.mit; @@ -4767,8 +4767,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.89.0"; - hash = "sha256-dlAgnN8Ku6hapJrWI8DPAFbbOFllr9pu8H6atWdkNYc="; + version = "0.90.8"; + hash = "sha256-0I4jf9Ba8PlNM0eUYHaMyCvuHZ5U3+RvT8aIbHJu9KU="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5169,8 +5169,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.0.5"; - hash = "sha256-Ja0zWCHHxd1XE2f2ZQvchqzCKv0pbcAU3uEh2f6+X3c="; + version = "3.0.6"; + hash = "sha256-hQfS6JTq4hQM5JDCtYFfIaBoV5ORbnao/CL5bqgu+jk="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 81b82c2a6097..8cd8ec902d30 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-wFFzUwOyaMInaVskKK/KA1eDd71fZ2j+snZ2NvFB5nU="; + hash = "sha256-VSbrKzj+FBK+MtXkBJzHe8pEODQACCYgADKYyyKUHAY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f681eb3b11e2..a6f199a4c6b4 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -14,19 +14,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-2hmkSgS3r4ghAXA8E0blWhe7kLvtZoApSRWXf6Ff5AE="; + hash = "sha256-4vZn0n2oQ0Bu1k/mOo5QYON9FyUCnifQWi7rt8v64Qw="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-XVygGMHtEhk+Fttd/xdZr5Yau9P3yCSo43RrXhqh/PQ="; + hash = "sha256-L7FproPmOySe3SuLyvaD5hje9/QecRpVgSATSzddD9U="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-8awJFJVSo6ru3ej4utkTF/5eK4dMw63Z3KHNHRRFSBs="; + hash = "sha256-fJt5UXPdUSQHD1t1ThArnD2n+1hVpzXJD+CNKzQoaI0="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-JNik8Q9/BDjjuLVNJFOazyH9/a4s2HmkuENLQlDdKP4="; + hash = "sha256-u3H2+nz6lJtMXn38dDnshaJcnoC7cKJg2q2n0nCa0Dc="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.41"; + version = "0.1.43"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index e47b2645959f..7dfe635d81a8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -81,7 +81,6 @@ callPackage ./generic.nix rec { maintainers = with lib.maintainers; [ synthetica bobby285271 - ludovicopiero ]; mainProgram = "codium"; platforms = [ diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 52c880e10e9a..62d941899e5f 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-08-30"; + version = "0-unstable-2025-09-12"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "4aa5e5b8ef4fc94143680fda8c598839bb336bdc"; - hash = "sha256-xO4v5BO9V/ECoM/Mr5weDlpPJCOzRnYMTlaSkO/UiYg="; + rev = "1f7783651749e42a0e580acb5f5a1b5f43cc1467"; + hash = "sha256-ltjBzAGfUrB5Rl+0ugI6HIFptiCwhfIDOCeUQpHJsR4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 471993cb12f2..643afe13598c 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-08-18"; + version = "0-unstable-2025-09-04"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "d9f594146b6c43b7b15ee2569d1175e62030f0cb"; - hash = "sha256-sQZUuAwCYy4YKaiPPt+0q8lblqb7U7kiGWk2kYK3Kmk="; + rev = "e42c983a90d3334bed659ecc12939ca935bef1c3"; + hash = "sha256-HfLxZ9OWX++hvT7ru8OOtYGFmfwVlLqne3n/vjdn7CY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 8ac5058ceebc..bcf38d2ab29c 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -58,34 +58,42 @@ let passthru = { inherit tesseractBase languages tessdata; }; # Only run test when all languages are available - test = lib.optionalAttrs (enableLanguages == null) { - tests.default = - runCommand "tesseract-test-ocr" - { - buildInputs = [ - tesseractWithData - imagemagick - ]; - } - '' - text="hello nix" + test = + runCommand "tesseract-test-ocr" + { + buildInputs = [ + tesseractWithData + imagemagick + ]; + } + '' + text="hello nix" - convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ - -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null - ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") + convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ + -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null + ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") - if [[ $ocrResult != $text ]]; then - echo "OCR test failed" - echo "expected: '$text'" - echo "actual: '$ocrResult'" - exit 1 - fi - touch $out - ''; - }; + if [[ $ocrResult != $text ]]; then + echo "OCR test failed" + echo "expected: '$text'" + echo "actual: '$ocrResult'" + exit 1 + fi + touch $out + ''; tesseract = - (if enableLanguages == [ ] then tesseractBase else tesseractWithData) // passthru // test; + (if enableLanguages == [ ] then tesseractBase else tesseractWithData).overrideAttrs + (old: { + passthru = + (old.passthru or { }) + // passthru + // lib.optionalAttrs (enableLanguages == null) { + tests = (old.passthru.tests or { }) // { + default = test; + }; + }; + }); in if enableLanguagesHash == null then tesseract diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index e157e886028e..dd7f062492f9 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.30.3"; + version = "0.30.4"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-YsyKCSSxg0THflzPVF9yRn1X2liVT5xNafeQej/pdyI="; + hash = "sha256-iG1f43gvKcu8jlVJ47IH5A6Ld8zusEbZL2Xou6ix5QU="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 7f88ab6e6dd4..caa60413028a 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -14,16 +14,16 @@ builtins.mapAttrs }: buildGoModule rec { inherit pname; - version = "3.30.2"; + version = "3.30.3"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-UvHrCA/1n9dklcMY1AfNNW5/TtxVdmwmQb2DHEBFZhA="; + hash = "sha256-Z2kYUak/zzO0IsKQyQ6sb3UD4QUZ9+9vGGVfl4qdPF8="; }; - vendorHash = "sha256-Cp1Eo8Xa4c0o5l6/p+pyHa/t3jMUpgUDDXEAKwS6aCE="; + vendorHash = "sha256-C9sge+xNTsW30PF2wJhRUNI1YEmXInD+xcboCtcC9kc="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f42eb035ab6..c915865d7c70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -126,13 +126,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-5W12hwonBaEto5PTnvcBm9qeeIY37ALsyXs0r9pfVak=", + "hash": "sha256-McrDfdkmV6pvzMGSqLgPopQk2o3Gg3I/0Qfr5jVR4uw=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.11.0", + "rev": "v6.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-i3NwpixAXi9PzciiwTtHB8yrzLWv67gHiDY4HshAbBo=" + "vendorHash": "sha256-eci9CC5Gf0Wgfci1Yof9X7pCPcJiITwYxEcCzBcYDU0=" }, "awscc": { "hash": "sha256-1ZOxJyjDVLhbVEdiSIWF+eNVZ9g2coyz1Bq1TWYq768=", @@ -660,13 +660,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-llsHIVqRN1yKQnMYA0MIinbUk2TL+NYeI0UlUcpCnN0=", + "hash": "sha256-sNhAq5htdk9cXVCHBfSdePy/On5JqMSoW/fbi2eiqVc=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.81.1", + "rev": "v1.82.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-cWfISNNeVPb6BU2V3sLbvlnFKzf3fVniV5Lu1Kpb9f0=" + "vendorHash": "sha256-AF93N5v9pzDOoCF3IF4SBprvNZZTR+KQKSN31an7l1g=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -912,13 +912,13 @@ "vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ=" }, "ns1": { - "hash": "sha256-fRF2UsVpIWg0UGPAePEULxAjKi1TioYEeOeSxUuhvIc=", + "hash": "sha256-xIl0jUYmXe2tom8HwXLQRbdSWWyZkRtdDc0XqkQ0RcQ=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.6.5", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9J8RrnF9k503YLmg5rBA8u8SqldhB5AF4+PVtUy8wX8=" + "vendorHash": "sha256-HC2MCVF3gS4nXKplC1pGrdjbhjRzr03ajqZ7pQIgSOc=" }, "null": { "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=", @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-Icua01a4ILF+oAO5nMeCGPZrWc3V/SVObWydO72CU3I=" }, "scaleway": { - "hash": "sha256-YUOfCTtlPn9UBnmmPNODUwEbGR4EkknkdIVdZpmDnQw=", + "hash": "sha256-FiC5FAag+ycf8Ti1iDXsJM5cb7xQUx8RLlv0gJ3+cNA=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.59.0", + "rev": "v2.60.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VH20r9RBlygGXuriXCzs3xBar/l3blPR+UcgCobIdWU=" + "vendorHash": "sha256-z8MzanM6u5CJSy7EFI583otoMzubkIrEuK1bldmV0u8=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index a2104beae1e3..d3508872cf60 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -52,8 +52,6 @@ lib.makeScope newScope ( purple-lurch = callPackage ./purple-lurch { }; - purple-matrix = callPackage ./purple-matrix { }; - purple-mm-sms = callPackage ./purple-mm-sms { }; purple-plugin-pack = callPackage ./purple-plugin-pack { }; @@ -69,5 +67,9 @@ lib.makeScope newScope ( pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { }; purple-facebook = callPackage ./purple-facebook { }; + + } + // lib.optionalAttrs config.allowAliases { + purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed."; } ) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix deleted file mode 100644 index 1bb3a3943092..000000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - pidgin, - json-glib, - glib, - http-parser, - sqlite, - olm, - libgcrypt, -}: - -stdenv.mkDerivation { - pname = "purple-matrix-unstable"; - version = "2019-06-06"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "purple-matrix"; - rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1"; - sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; - }; - - env.NIX_CFLAGS_COMPILE = builtins.toString [ - # glib-2.62 deprecations - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - # override "-O0 -Werror" set by build system - "-O3" - "-Wno-error" - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - pidgin - json-glib - glib - http-parser - sqlite - olm - libgcrypt - ]; - - makeFlags = [ - "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" - "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" - ]; - - buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin - - meta = with lib; { - homepage = "https://github.com/matrix-org/purple-matrix"; - description = "Matrix support for Pidgin / libpurple"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ symphorien ]; - }; -} diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index d592ffe03741..e77ae5eae714 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "9.0.3"; + version = "9.0.4"; src = { - rev = "08e2e9df692929a2087bbf1340a915aa2365c622"; - sha256 = "19rij2hz79rsmikdbygxzll2l7im5qi3i6phz4sdiagkc5k8b3rb"; + rev = "aa7c96856b2c145cc83727304a0d86be6648efa0"; + sha256 = "0736hhf8rs4g8cyhy3xyamyr4iszlvf18a1hwfpcv6qxy0hcbdcv"; }; }; libVersion = { - version = "9.0.3"; + version = "9.0.4"; libSources = { - symbols.rev = "77ee421d180de82fce2d8c00f1b13a9456b43526"; - symbols.sha256 = "0r9aimyrv7p4ykqnwb9ac3fd0dv11zmv2ll6qkmm5s875s35hhfl"; - templates.rev = "6e651a795134380ac0dc3df1417d11cfab228033"; + symbols.rev = "13ded2487d953fa9db16181eae38f890618296f7"; + symbols.sha256 = "0qm1zq8bq6r7l1pssb9isnm5a03kixf5p3x7670ap4xwligdn3wg"; + templates.rev = "c324e461b7e279eaaa3e15348fab15b6b36c02ba"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "3ef8a3e0691599c633864118a3241e1cbeb873f1"; - footprints.sha256 = "1ysnj0973y05nn016hxrghccfv65cas772i369xflay0sns8anqf"; - packages3d.rev = "4c91925fde1402cc6da61d97cfb30a3de08d5bb6"; - packages3d.sha256 = "0njv4y31k62qhcx0xxcl94p34jgna8z4bs3hwjwzjfmp7ddl2dyx"; + footprints.rev = "0037953aada2d21e595bd82a5c44fcb20164191f"; + footprints.sha256 = "15kdg661pq79npwb4j28hllqrvwygsz5rblzbdishiikysrba8wl"; + packages3d.rev = "1ca1b14c02301828b539d756cf6306e5f1e13b5e"; + packages3d.sha256 = "0ngf0k5f0a073k5v4q78zk6gj6xjjxzbb6551qf9k9wy8bsmgr2k"; }; }; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index 559d5db86cba..cef41a7119a4 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs="; + sha256 = "sha256-GrfogPsqpQ976Gcc4JVdslAAWTj49PdspwVp/JXYXSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ab/abseil-cpp_202508/package.nix b/pkgs/by-name/ab/abseil-cpp_202508/package.nix new file mode 100644 index 000000000000..8fee318a4947 --- /dev/null +++ b/pkgs/by-name/ab/abseil-cpp_202508/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + static ? stdenv.hostPlatform.isStatic, + cxxStandard ? null, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "abseil-cpp"; + version = "20250814.0"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + tag = finalAttrs.version; + hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI="; + }; + + cmakeFlags = [ + (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true) + (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) + ] + ++ lib.optionals (cxxStandard != null) [ + (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard) + ]; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gtest ]; + + meta = { + description = "Open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.GaetanLepage ]; + }; +}) diff --git a/pkgs/by-name/ae/aespipe/package.nix b/pkgs/by-name/ae/aespipe/package.nix index e077b6d592a8..14b4668a97bf 100644 --- a/pkgs/by-name/ae/aespipe/package.nix +++ b/pkgs/by-name/ae/aespipe/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "aespipe"; - version = "2.4i"; + version = "2.4j"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "sha256-tBx6qsJULlnY/1jB/52HtS1KjBhHt5nIr+yR2UUXx14="; + sha256 = "sha256-RI/h5YYSwYSVFkXd2Sb8W9tk/E8vgox2bIKqESfpo+I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix index 3da4dba9df3b..c1c34fcc6710 100644 --- a/pkgs/by-name/ai/airgeddon/package.nix +++ b/pkgs/by-name/ai/airgeddon/package.nix @@ -114,13 +114,13 @@ let in stdenv.mkDerivation rec { pname = "airgeddon"; - version = "11.51"; + version = "11.52"; src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; tag = "v${version}"; - hash = "sha256-PkP8sPpX/z3yjvTpsRYJ9fKzUaMsnCp+p6AAoTlcAA0="; + hash = "sha256-FQB348wOXi89CnjS32cwZwTewjkguTbhK5Izvh/74Q0="; }; strictDeps = true; diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index b8eb338cca50..c4a462ba49ea 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -11,6 +11,7 @@ bzip2, celt, ffmpeg, + gmp, jack2, lame, libX11, @@ -37,7 +38,6 @@ x264, xvidcore, }: - rustPlatform.buildRustPackage rec { pname = "alvr"; version = "20.14.1"; @@ -90,6 +90,7 @@ rustPlatform.buildRustPackage rec { bzip2 celt ffmpeg + gmp jack2 lame libX11 diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 997d7c29327e..c5422673c020 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -82,7 +82,6 @@ buildNpmPackage (finalAttrs: { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ keegancsmith - owickstrom ]; mainProgram = "amp"; }; diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/deps.json b/pkgs/by-name/az/azure-artifacts-credprovider/deps.json index 33747a3b6eae..c9969113cf08 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/deps.json +++ b/pkgs/by-name/az/azure-artifacts-credprovider/deps.json @@ -2,1021 +2,475 @@ { "pname": "Castle.Core", "version": "5.1.1", - "sha256": "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1" + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/castle.core/5.1.1/castle.core.5.1.1.nupkg" }, { "pname": "FluentAssertions", "version": "5.9.0", - "sha256": "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x" + "hash": "sha256-HV33Gw4fNoJsJkrqhWvzAlHb8qhkhmXosV5kpQy1t4Y=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/fluentassertions/5.9.0/fluentassertions.5.9.0.nupkg" }, { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "3.1.10", - "sha256": "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "6.0.29", - "sha256": "1ld7aipybxbhwnybimsnhv09ib9ib824zkj11qk3aq7ncz6pfazr" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "3.1.32", - "sha256": "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "6.0.29", - "sha256": "0z359wbz3014rwz7cdcr60qr6mrcwsbwwh36g59a5hncxb1g73rj" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.4", - "sha256": "0g2sjwgkgni797p6ay51brvc9snbnrbsmv88002lnvqnz9zgbifr" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3" + "pname": "Microsoft.ApplicationInsights", + "version": "2.22.0", + "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.applicationinsights/2.22.0/microsoft.applicationinsights.2.22.0.nupkg" }, { "pname": "Microsoft.Build.Tasks.Git", "version": "1.0.0-beta2-19554-01", - "sha256": "1ry7vaknwvidycxg76mbwwz4i981zcxqvlsgiqgz602jgx9qsn48" + "hash": "sha256-iFiNU39SAPMfjk/TjTv7AaVIPuermvM68y1ubqfax+c=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.build.tasks.git/1.0.0-beta2-19554-01/microsoft.build.tasks.git.1.0.0-beta2-19554-01.nupkg" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.5.0", - "sha256": "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4" + "version": "17.13.0", + "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.codecoverage/17.13.0/microsoft.codecoverage.17.13.0.nupkg" }, { - "pname": "Microsoft.Extensions.Configuration", - "version": "6.0.0", - "sha256": "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "6.0.0", - "sha256": "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "6.0.0", - "sha256": "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc" + "pname": "Microsoft.DiaSymReader", + "version": "2.0.0", + "hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg" }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "6.0.0", - "sha256": "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1" + "hash": "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.dependencyinjection/6.0.0/microsoft.extensions.dependencyinjection.6.0.0.nupkg" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "6.0.0", - "sha256": "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9" + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/6.0.0/microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "6.0.1", + "hash": "sha256-ArXJ7mfSywrfif29cfkeaXL1s0soZSi+RZgAimukqNw=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.dependencymodel/6.0.1/microsoft.extensions.dependencymodel.6.0.1.nupkg" }, { "pname": "Microsoft.Extensions.Logging", "version": "6.0.0", - "sha256": "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi" + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.logging/6.0.0/microsoft.extensions.logging.6.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "6.0.3", - "sha256": "1lpr7bwandzvppjsx75b1nsh52whlsq2ddgwv1ncwdbi595jrkpc" - }, - { - "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "6.0.0", - "sha256": "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1" - }, - { - "pname": "Microsoft.Extensions.Logging.Console", - "version": "6.0.0", - "sha256": "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d" - }, - { - "pname": "Microsoft.Extensions.Logging.Debug", - "version": "6.0.0", - "sha256": "0aql9kc45g2d6z1hmwr3p1a2qy9m3f36bds3054givsnpnis81wk" + "hash": "sha256-7M4sSypxNc5s2Py1JrCmkIsCtQ2rnK7lvfs3q/g6+dI=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.logging.abstractions/6.0.3/microsoft.extensions.logging.abstractions.6.0.3.nupkg" }, { "pname": "Microsoft.Extensions.Options", "version": "6.0.0", - "sha256": "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g" - }, - { - "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "6.0.0", - "sha256": "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba" + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.options/6.0.0/microsoft.extensions.options.6.0.0.nupkg" }, { "pname": "Microsoft.Extensions.Primitives", "version": "6.0.0", - "sha256": "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2" + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.extensions.primitives/6.0.0/microsoft.extensions.primitives.6.0.0.nupkg" }, { "pname": "Microsoft.Identity.Client", "version": "4.64.0", - "sha256": "1xfliq7fnz3rqfcmjg8329bf253pjw6xnjnfmm1aq9c4xzc7ph2n" + "hash": "sha256-VsB72O+EJaxCrc5K2w2XdxThVhIDPVmZw3l86w6O1PU=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.identity.client/4.64.0/microsoft.identity.client.4.64.0.nupkg" }, { "pname": "Microsoft.Identity.Client.Broker", "version": "4.64.0", - "sha256": "08zsp4cgx4kw90x7zy7klgasc36mpsfy1jr3vj9wpd3cv5ns3m0m" + "hash": "sha256-FdShbdlstMuT3CPL4J2+1Qym1aPz+H86SHyS/hi5+iM=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.identity.client.broker/4.64.0/microsoft.identity.client.broker.4.64.0.nupkg" }, { "pname": "Microsoft.Identity.Client.Extensions.Msal", "version": "4.64.0", - "sha256": "0s00hczrhzxy9psw690wrw996gvbivcdvrypdyiqhmxfnh8hhdkl" + "hash": "sha256-dDYIEbSuV4ijb9fn3diOaz+TEs8cJMP1Tb5/mD+DAGg=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.identity.client.extensions.msal/4.64.0/microsoft.identity.client.extensions.msal.4.64.0.nupkg" }, { "pname": "Microsoft.Identity.Client.NativeInterop", "version": "0.16.2", - "sha256": "1mbw5wlnha0ac8rhfsr8f0dpi3r2lmqvgasv9z8gkylskqpcall6" + "hash": "sha256-hlLFLp6a+vnQT1urt3GlIo94G3AoawczYgooaCkvfNU=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.identity.client.nativeinterop/0.16.2/microsoft.identity.client.nativeinterop.0.16.2.nupkg" }, { "pname": "Microsoft.IdentityModel.Abstractions", "version": "6.35.0", - "sha256": "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g" + "hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.identitymodel.abstractions/6.35.0/microsoft.identitymodel.abstractions.6.35.0.nupkg" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.5.0", - "sha256": "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "3.1.32", - "sha256": "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "6.0.29", - "sha256": "1g9qlb4k3i8zq5kn4y8v7lc9mqhy3ikh2bla30nqv86iwaclrwb7" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "3.1.0", - "sha256": "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "6.0.29", - "sha256": "0d0xy3zmrlfzc7zk6hpx69mr5b6p28aj944403c7akhzpg1zz2r1" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "3.1.32", - "sha256": "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "6.0.29", - "sha256": "0gv5dnd44xj1yidzd70b01s5a19khbq757llkfykgwf7wl4a89cf" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.4", - "sha256": "0pi459crkny9bwjl2z4znj9kgnkwl00bnc54jq9asi8zvssvcbfm" + "version": "17.13.0", + "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.net.test.sdk/17.13.0/microsoft.net.test.sdk.17.13.0.nupkg" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "3.1.0", - "sha256": "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies", - "version": "1.0.3", - "sha256": "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", - "version": "1.0.3", - "sha256": "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies.net481", - "version": "1.0.3", - "sha256": "0i6gsrxvybhrnb8l7fk00zcm4z33bv7kikfm8anya89h4yxlhy4i" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg" }, { "pname": "Microsoft.SourceLink.Common", "version": "1.0.0-beta2-19554-01", - "sha256": "14g7c5j85vlxcpwh2xs92ix1c6gxlpl22zfjp4vp55n8q73f1q4n" + "hash": "sha256-luDgxsHIlnI3udJ9Ieil/RkWehRJdwH5ZZ3ugmRh55E=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.sourcelink.common/1.0.0-beta2-19554-01/microsoft.sourcelink.common.1.0.0-beta2-19554-01.nupkg" }, { "pname": "Microsoft.SourceLink.GitHub", "version": "1.0.0-beta2-19554-01", - "sha256": "0bpcy6129pk9znhs8dfaxwrknpmzh6w49z83971m4cvbgq0vh9iy" + "hash": "sha256-Pia4AX5rM1LDSQP9RLiBv147M+/KNaSh/WneJILx7C4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.sourcelink.github/1.0.0-beta2-19554-01/microsoft.sourcelink.github.1.0.0-beta2-19554-01.nupkg" + }, + { + "pname": "Microsoft.Testing.Extensions.CodeCoverage", + "version": "17.13.1", + "hash": "sha256-m74V71udgx4OZScpfyVeA0Oj5JKIvdU1W5wzXyeUHLQ=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.extensions.codecoverage/17.13.1/microsoft.testing.extensions.codecoverage.17.13.1.nupkg" + }, + { + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.6.2", + "hash": "sha256-GZYUH+0vWAif5p4S81Oo9Tsez68ylsLjEQWhI2rgcik=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.extensions.telemetry/1.6.2/microsoft.testing.extensions.telemetry.1.6.2.nupkg" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport", + "version": "1.6.2", + "hash": "sha256-21x7FSFGVGXS8fkOQyr3jxsemxU8+7ugkVzo+mOP0Ic=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.extensions.trxreport/1.6.2/microsoft.testing.extensions.trxreport.1.6.2.nupkg" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.6.2", + "hash": "sha256-UOpDBbW3xgahofRjqdw3wUj63zXVdkIAfUE7dA4uI4Y=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.extensions.trxreport.abstractions/1.6.2/microsoft.testing.extensions.trxreport.abstractions.1.6.2.nupkg" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.6.2", + "hash": "sha256-SWaSPgc2PQNqsz7ea/SQsmqOX6le6dmrDbwCHfbppZo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.extensions.vstestbridge/1.6.2/microsoft.testing.extensions.vstestbridge.1.6.2.nupkg" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.4.3", + "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.platform/1.4.3/microsoft.testing.platform.1.4.3.nupkg" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.6.2", + "hash": "sha256-RfdgATa3aTYLpGfv8ORI5uEP8dH87L5/gBDkxAG6ho4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.platform/1.6.2/microsoft.testing.platform.1.6.2.nupkg" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.6.2", + "hash": "sha256-bzlz10QeFrCAR+1og0gXbxSbpO64wCFrwAhBUwAp0nI=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testing.platform.msbuild/1.6.2/microsoft.testing.platform.msbuild.1.6.2.nupkg" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.5.0", - "sha256": "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls" + "version": "17.13.0", + "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.13.0/microsoft.testplatform.objectmodel.17.13.0.nupkg" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.5.0", - "sha256": "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3" + "version": "17.13.0", + "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.testplatform.testhost/17.13.0/microsoft.testplatform.testhost.17.13.0.nupkg" }, { "pname": "Microsoft.VisualStudioEng.MicroBuild.Core", "version": "1.0.0", - "sha256": "0i7qyqjn0xj5vsyskcp33d3r2f3hk0cw2rzy3hbkbsgi1wyjxxyh" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.7.0", - "sha256": "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs" + "hash": "sha256-0PcuPQ/x6TUXHP5nwRmYcDiRRxvjsqm93kV2YCX2+EQ=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.visualstudioeng.microbuild.core/1.0.0/microsoft.visualstudioeng.microbuild.core.1.0.0.nupkg" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/microsoft.win32.systemevents/6.0.0/microsoft.win32.systemevents.6.0.0.nupkg" }, { "pname": "Moq", "version": "4.18.4", - "sha256": "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94" + "hash": "sha256-JOmYlcTJdQOthRxnT0jAD6WG+NVLMmIV2BM9rNhNg3Q=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/moq/4.18.4/moq.4.18.4.nupkg" + }, + { + "pname": "MSTest", + "version": "3.8.2", + "hash": "sha256-k6M9buNaP/y+e4/4dsSWxsFWMmocWocDh3LW1jL97/A=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/mstest/3.8.2/mstest.3.8.2.nupkg" + }, + { + "pname": "MSTest.Analyzers", + "version": "3.8.2", + "hash": "sha256-r+JAxw77n/PQpQviXn8j1M+ccb9GVHTNuPWwffacVkg=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/mstest.analyzers/3.8.2/mstest.analyzers.3.8.2.nupkg" }, { "pname": "MSTest.TestAdapter", - "version": "2.2.10", - "sha256": "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6" + "version": "3.8.2", + "hash": "sha256-z5fZWSvyxvohB8Vl6gtb8nsAGt/9saXLZRckuzfVg/Y=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/mstest.testadapter/3.8.2/mstest.testadapter.3.8.2.nupkg" }, { "pname": "MSTest.TestFramework", - "version": "2.2.10", - "sha256": "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw" - }, - { - "pname": "NETStandard.Library", - "version": "1.6.1", - "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8" + "version": "3.8.2", + "hash": "sha256-NjQ1XU3vMRdFZSE6Ju2ASopCPZFpFZaPAQdRudqAf5c=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/mstest.testframework/3.8.2/mstest.testframework.3.8.2.nupkg" }, { "pname": "NETStandard.Library", "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", - "sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7" + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg" }, { "pname": "NuGet.Common", "version": "6.7.1", - "sha256": "0walcb2pkbzmf5j06b23zpbrpha8bb0waq6jv9vdz68d4wzxqgxm" + "hash": "sha256-tT/cPycNmd922tJgxcFaSMGb1/1DLANkcfWvecViVHE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.common/6.7.1/nuget.common.6.7.1.nupkg" }, { "pname": "NuGet.Configuration", "version": "6.7.1", - "sha256": "1ii5c7x0in4h6ax8ldpgaca53ybj30k8qs7lmrp3fflf07a18bq0" - }, - { - "pname": "NuGet.Frameworks", - "version": "5.11.0", - "sha256": "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z" + "hash": "sha256-AC8U1AGOOjdurvRojCYYcvlRFFPvNoq6MpDYCPphJcY=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.configuration/6.7.1/nuget.configuration.6.7.1.nupkg" }, { "pname": "NuGet.Frameworks", "version": "6.7.1", - "sha256": "1rwn91i2kizwc716zw45yqp0wbls0q2y8r38h7vnsrzr7y6glk3x" + "hash": "sha256-fUz6jD/5Z233gWhk5AUGmi4OLvaF8G/CYfzHKWJIluc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.frameworks/6.7.1/nuget.frameworks.6.7.1.nupkg" }, { "pname": "NuGet.Packaging", "version": "6.7.1", - "sha256": "1slnwh9n7g6q0lvbj0wvrdix600hn2f0sazh3zwsw3mhdxwywghf" + "hash": "sha256-Dj7ueW+wDq75H/ArDZywEADTY8ubA7k2Bdi8YxPkluo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.packaging/6.7.1/nuget.packaging.6.7.1.nupkg" }, { "pname": "NuGet.Protocol", "version": "6.7.1", - "sha256": "0gxlkgp14lvrz8jcj9nn5dprlql3bsl6kzkvm3dmajlb56ip23sw" + "hash": "sha256-XA9xoymLSlXbqHv+aaheg2KabyvWJskk+nlTEu6btD8=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.protocol/6.7.1/nuget.protocol.6.7.1.nupkg" }, { "pname": "NuGet.Versioning", "version": "6.7.1", - "sha256": "195rywflfwwwlfsil0zc6zf5pdzvkh3ii6311dfwl7wsvdiam4dn" + "hash": "sha256-tpGqYtuaH8pdC2GYGAec+7db3DfsAxq1o5xzRx33uaQ=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/nuget.versioning/6.7.1/nuget.versioning.6.7.1.nupkg" }, { "pname": "PowerArgs", "version": "3.6.0", - "sha256": "1rxb4ljx4paf9ms3hcn5mspa0ki051l2w2ajrqjkyf9cmqrpks0h" + "hash": "sha256-EOh5M64sOT8lzlIJLmgoIE6grq7FMjh0TU5d0iUlq+c=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/powerargs/3.6.0/powerargs.3.6.0.nupkg" }, { "pname": "ReferenceTrimmer", - "version": "3.1.17", - "sha256": "1y36xqbr53mm54f4sg341fig0lym27002bn9j1xrvj07sla63ipg" - }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" - }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "version": "3.3.11", + "hash": "sha256-r+7dehH64aAzicFT/BkLMZcuSEtaS3g/nFmjvv0OJXc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/referencetrimmer/3.3.11/referencetrimmer.3.3.11.nupkg" }, { "pname": "System.Buffers", "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" + "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.buffers/4.4.0/system.buffers.4.4.0.nupkg" }, { "pname": "System.Buffers", "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg" }, { - "pname": "System.Collections", - "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg" }, { "pname": "System.Configuration.ConfigurationManager", "version": "6.0.0", - "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw" - }, - { - "pname": "System.Console", - "version": "4.3.0", - "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.configuration.configurationmanager/6.0.0/system.configuration.configurationmanager.6.0.0.nupkg" }, { "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "version": "5.0.0", + "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.0", - "sha256": "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5" + "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.diagnostics.diagnosticsource/6.0.0/system.diagnostics.diagnosticsource.6.0.0.nupkg" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", - "sha256": "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy" - }, - { - "pname": "System.Diagnostics.EventLog", - "version": "4.7.0", - "sha256": "11pqwbs8pchdqhh9438cp3pf28izzv12h60121h7z99ihhql7n97" + "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.diagnostics.diagnosticsource/6.0.1/system.diagnostics.diagnosticsource.6.0.1.nupkg" }, { "pname": "System.Diagnostics.EventLog", "version": "6.0.0", - "sha256": "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd" - }, - { - "pname": "System.Diagnostics.TextWriterTraceListener", - "version": "4.3.0", - "sha256": "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.3.0", - "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1" - }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.3.0", - "sha256": "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.diagnostics.eventlog/6.0.0/system.diagnostics.eventlog.6.0.0.nupkg" }, { "pname": "System.Drawing.Common", "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg" }, { "pname": "System.Formats.Asn1", "version": "6.0.1", - "sha256": "02hs45gzkx3b3jvjrbdn0m54lkwbay5dprcs0ivfym59lmqv3wc1" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-gfGxcaWpVO92BJrl24pXi09KSgW2rSy3HGv0+V8hGgo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.formats.asn1/6.0.1/system.formats.asn1.6.0.1.nupkg" }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", - "sha256": "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg" }, { "pname": "System.Memory", "version": "4.5.0", - "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30" + "hash": "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.memory/4.5.0/system.memory.4.5.0.nupkg" }, { "pname": "System.Memory", "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Net.Http", - "version": "4.3.0", - "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla" + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg" }, { "pname": "System.Numerics.Vectors", "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.7.0", - "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg" }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", - "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4" + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg" }, { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.0", - "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43" + "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.5.0/system.runtime.compilerservices.unsafe.4.5.0.nupkg" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Security.AccessControl", - "version": "4.7.0", - "sha256": "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg" }, { "pname": "System.Security.AccessControl", "version": "6.0.0", - "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "5.0.0", - "sha256": "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg" }, { "pname": "System.Security.Cryptography.Pkcs", "version": "6.0.4", - "sha256": "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.cryptography.pkcs/6.0.4/system.security.cryptography.pkcs.6.0.4.nupkg" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.4.0", - "sha256": "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6" + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", - "sha256": "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7" + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.cryptography.protecteddata/4.5.0/system.security.cryptography.protecteddata.4.5.0.nupkg" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "6.0.0", - "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.cryptography.protecteddata/6.0.0/system.security.cryptography.protecteddata.6.0.0.nupkg" }, { "pname": "System.Security.Permissions", "version": "6.0.0", - "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw" - }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.7.0", - "sha256": "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d" + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.permissions/6.0.0/system.security.permissions.6.0.0.nupkg" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg" }, { "pname": "System.Text.Encodings.Web", "version": "6.0.0", - "sha256": "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai" + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.text.encodings.web/6.0.0/system.text.encodings.web.6.0.0.nupkg" }, { "pname": "System.Text.Json", - "version": "6.0.7", - "sha256": "0sp80yysfm4s0zcrk7f6b2dvkq6civlwn86swv0d537qf75r2vrv" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56" - }, - { - "pname": "System.ValueTuple", - "version": "4.4.0", - "sha256": "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.text.json/6.0.10/system.text.json.6.0.10.nupkg" }, { "pname": "System.Windows.Extensions", "version": "6.0.0", - "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd" + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=", + "url": "https://pkgs.dev.azure.com/mseng/c86767d8-af79-4303-a7e6-21da0ba435e2/_packaging/a319f538-6c19-4e2e-9df3-0222939da271/nuget/v3/flat2/system.windows.extensions/6.0.0/system.windows.extensions.6.0.0.nupkg" } ] diff --git a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix index 67f5f79101fa..1fe29665fb55 100644 --- a/pkgs/by-name/az/azure-artifacts-credprovider/package.nix +++ b/pkgs/by-name/az/azure-artifacts-credprovider/package.nix @@ -8,12 +8,12 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "artifacts-credprovider"; rev = "v${version}"; - sha256 = "sha256-JbcoDs4c/+uKIgVWZkuo4jqd1hlqe+H949jNfkDwZls="; + sha256 = "sha256-MYOl+UfRExeZsozcPJynWbx5JpYL0dxTADycAt6Wm7o="; }; pname = "azure-artifacts-credprovider"; projectFile = "CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj"; diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index e62e4be0a1b5..c3dc1325236c 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "22.3.0"; + version = "22.4.1"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-V/y2gsHjcWyduIYq+lddRqAC5ECafNBXQ0tiK/dLHOI="; + hash = "sha256-eUkH2rzYiNkMAB3NrDzd20nmeP12uJxTcFISE+6Ty7o="; }; - npmDepsHash = "sha256-SWtWXvWUuIzMqLoEDRTqVJyWNK/FXOA/LF73kCWfuz4="; + npmDepsHash = "sha256-WEYhtsCOdupU7nYF7scy4QP3/PVcchJX9CRRWjSkBJQ="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix index 3eb7a82f4dfb..6ca0b8f337bc 100644 --- a/pkgs/by-name/ba/bash-preexec/package.nix +++ b/pkgs/by-name/ba/bash-preexec/package.nix @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "rcaloras"; repo = "bash-preexec"; - rev = version; - sha256 = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU="; + tag = version; + hash = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU="; }; nativeCheckInputs = [ bats ]; @@ -26,30 +26,39 @@ stdenvNoCC.mkDerivation { dontBuild = true; patchPhase = '' + runHook prePatch + # Needed since the tests expect that HISTCONTROL is set. sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats # Skip tests failing with Bats 1.5.0. # See https://github.com/rcaloras/bash-preexec/issues/121 sed -i '/^@test.*IFS/,/^}/d' test/bash-preexec.bats + + runHook postPatch ''; checkPhase = '' + runHook preCheck bats test + runHook postCheck ''; installPhase = '' - install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh + runHook preInstall + install -Dm755 bash-preexec.sh $out/share/bash/bash-preexec.sh + runHook postInstall ''; - meta = with lib; { + meta = { description = "Preexec and precmd functions for Bash just like Zsh"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/rcaloras/bash-preexec"; - maintainers = [ - maintainers.hawkw - maintainers.rycee + changelog = "https://github.com/rcaloras/bash-preexec/releases/tag/${version}"; + maintainers = with lib.maintainers; [ + hawkw + rycee ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index dc6cd3e4ed11..1582fd7ec7ab 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.50.1"; + version = "1.51.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; tag = "v${version}"; - hash = "sha256-cUfuTYk3ckijSZbniHaZuprlv9rKNIxzILEdTGdvVQ0="; + hash = "sha256-aqyINnOVzWVnQ0F2aRxlMIM+CwYwnfnclavlgBV/UCo="; }; - vendorHash = "sha256-+2iiMb2+/a3GCUMVA9boJJxuFgB3NmxpTePyMEA46jw="; + vendorHash = "sha256-MBcJlMIYSqzJaxuS0YEoeXiVsD2AQj4aAXhN/P/E2MU="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 86fdb5e8f856..c2affaa67a31 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.31"; + version = "2.29.0"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "v2MkLqTNG9creNZBBshTuhrMxlF4OIDlzQOgrEyKmMY="; + sha256 = "i5R/O9pcIGpJqSl+txjDKl6qBDQmjNO2VJpDm6En4b8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "hFJdO/YFxwCpWBmR8jZwmak2Fc9wgMwLax5puaLVEbs="; + sha256 = "orymOOYL7/VwuN8itOhBSINNaBJ9gI7Zn2mTN55BpUA="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "RDk4DE0x24m5yBBezlGuLQ/l7yugyd5SYvfYoDFfJuI="; + sha256 = "d4GML/5uvMnx6g+PNaNEqD3pXVwzWLHFiV8VzSSvIHw="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "Xq0G0w2FJXEGVmXmyhbdzXY9OiZn4+5i8GypMOdeAhA="; + sha256 = "YZ61kEVr40BwiOCsQUz1UfiScNvWW1/ZF/daR+8BV+Q="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "cHmh1JyPa2u2c6KGlZC1/hlDlxMSrDKY1jwaEcJVq0M="; + sha256 = "IuFmV3FjMMY6bPooFU9egJplyP0fzi032QCZxr6Y1tw="; }; }; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 6a234c78a395..7ea87f3c5001 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -19,20 +19,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-NHl9+Z8r1dALs/epNO+bYLuETPH8MiFBI5x2kdg2gKQ="; + hash = "sha256-U6q82T/xqwREGsUcCdeAzvk9DWu9579MtF/JE0OIBW4="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-VMcSsaUmUJ4WcuBPoYxfmVpfvQQXY57LFpPiYdfFp2M="; + npmDepsHash = "sha256-i7bT6ZvdkHwqw+LkMqCdSMCNUsz1LPOHuF+u//lUYJ8="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index 69dcc09037bb..7d2e6c68fd64 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -7,12 +7,12 @@ }: let pname = "capacities"; - version = "1.50.4"; + version = "1.52.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage"; - hash = "sha256-8sp6q86C36FbJ1azhX5QWbb2PmqJ/bbZQX31yzNByU4="; + hash = "sha256-M5K2TxrB2Ut/wYKasl8EqbzLjFJrqjWfPIJTZV4fi4s="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix index 5a81dff095e2..3600a6b075f4 100644 --- a/pkgs/by-name/ca/cariddi/package.nix +++ b/pkgs/by-name/ca/cariddi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; tag = "v${version}"; - hash = "sha256-T9d1j2XH3D1JDb02jM3dXEs9FTXLpl8VXXNCJfFi5Kk="; + hash = "sha256-FIsbkDqXi/a0hfO8AqqCJgreHidDd3rtSNeu9qDXPZk="; }; - vendorHash = "sha256-RMqyD4OlymjlUFoTsLNd+wo1hhYaEsyqpKj1JHuW5FM="; + vendorHash = "sha256-XEk3U4E0WeDvn6JVBILRj5KD/DFJcz03qglMrPU+ksY="; ldflags = [ "-w" diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix index df833a46a863..e0972de49b02 100644 --- a/pkgs/by-name/cd/cdogs-sdl/package.nix +++ b/pkgs/by-name/cd/cdogs-sdl/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-jdrmtI/FADZ0vJDtX4Kq0A9RJ1ELjsQZjO2nMDf/fT8="; + sha256 = "sha256-g1eLFdHsmqnz6zTlmaiLOXgX5dnS94k/PvaFJE3gfLo="; }; postPatch = '' diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix index 8d1160694c1a..ff0ded1923bb 100644 --- a/pkgs/by-name/ch/cherrytree/package.nix +++ b/pkgs/by-name/ch/cherrytree/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cherrytree"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; tag = "v${finalAttrs.version}"; - hash = "sha256-WsxN2VGESrDUv0sSTsMSpZr6Ca7yDwGNR2aB3BrmfkY="; + hash = "sha256-VzY91ZyHL1gNj5liTzisA6iL74294CPLLa8duJy0m8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index b9865237e6b9..5523b7b2439f 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec { description = "Wayland clipboard manager that will make you clap"; homepage = "https://github.com/bjesus/clapboard"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ + dit7ya + bjesus + ]; platforms = platforms.linux; mainProgram = "clapboard"; }; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index c19112881d75..da12f6af8d21 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.109" + "@anthropic-ai/claude-code": "^1.0.113" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.109", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.109.tgz", - "integrity": "sha512-gjj76f/+M5KfI+ORA9VNVJgR7s8eyur66XCWIIO66q4poNWcszxidXo+TDTqokLLwuNV+qFGx4JkK/PDmtwqMA==", + "version": "1.0.113", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.113.tgz", + "integrity": "sha512-K/+N/rECfWa1ZauWLD6C/CnX6bxxAck5CFDuK58JjRN8v6QDuJVX7HZcNCanB0ucxEkaczAwvWnEM+UjFQsdqw==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index fb113bb47196..f3c3eb77eacd 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.109"; + version = "1.0.113"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-bmva84iO0iDf8V537DX6Ggh1PyjKEkfebx4CSB3f4/U="; + hash = "sha256-N3lKbu3OtF1X65Dr9JghMdgsqQD2RYS/YJUNtPJVyyw="; }; - npmDepsHash = "sha256-jpvy7b4A+E5iI7Y7kYnwH51BZAQGVXKaf3lQjI9e3OM="; + npmDepsHash = "sha256-z+EXesi9nfoTE+eX7BUZv50BzCWSxqKFfvRlJWWdWDU="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 27f07acd62bd..28b59322c36e 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "25.05"; + version = "25.09"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-ANYzpjVw9kGdsNvXW1A7sEug9utGmJTab87SqJSdgAc="; + hash = "sha256-qX9EZHuDtEcYCU8YOMbHTo3JDAAJ8nc6N7F/+AAEpn4="; }; # when building on darwin we need cctools to provide the correct libtool diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 0f023704788a..8557b1659f40 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "47.0"; + version = "48.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${version}"; - hash = "sha256-NzvK6gKu7pWwTqLaeDKyYedIjzRa85k9PGUGfeA2Y4c="; + hash = "sha256-cfS3sO1GQIxF9UlzKP9iE/UuJwGVIkNBN7GDF/ltn4Q="; }; - cargoHash = "sha256-s3lBlYbE9xoLov8JWeX89A7J00tCISoCDHHBoEcILus="; + cargoHash = "sha256-QvW1loljt9KzY0h2pG7n9NCkJJOYr/VxftsyqATm9DA="; separateDebugInfo = true; diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix index 6e1ad3be90b0..7b5cb9db2dae 100644 --- a/pkgs/by-name/cl/cloudflare-cli/package.nix +++ b/pkgs/by-name/cl/cloudflare-cli/package.nix @@ -6,31 +6,38 @@ yarnConfigHook, yarnInstallHook, nodejs, + makeBinaryWrapper, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "cloudflare-cli"; - version = "4.2.0"; + version = "5.0.5"; src = fetchFromGitHub { owner = "danielpigott"; repo = "cloudflare-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-cT+cMekXhHKfFi+dH1dCA/YNBSyYePJIZBSkDMPZZ14="; + hash = "sha256-+QlSKXkGXc72FCQAlfZnBK5tQ1jbpICxR1Xe73RSgbk="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-0SFXgaLQE/MkqC9id7DAiP422tEyTt2gpgpIdXViFBI="; + hash = "sha256-pPM2lKjSS6sFj5R+eaXT2mXoCQouq4UleCN1IQilnnw="; }; nativeBuildInputs = [ yarnConfigHook yarnInstallHook nodejs + makeBinaryWrapper ]; + postInstall = '' + wrapProgram $out/bin/cfcli \ + --chdir $out/lib/node_modules/cloudflare-cli + ''; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index cebfd799199f..87dfb5c3d95e 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "345"; + version = "346"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-dK2sMqPmxNKMKrlNkr7FoSaHY5Qn1dtNHX32d/IYu8U="; + hash = "sha256-ZTVcZ1a43cwm8y74XKp9z8tqSK1wxlW9lfoLN/cSFcs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 6e2a8c5789ea..da80335136e6 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.451" + "codebuff": "^1.0.473" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.451", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.451.tgz", - "integrity": "sha512-LYzX+cu1zMnU/qntnRMQzQ+iPT436OYphFyIrEvx5DarfEEns5UIMDyWp0E9PWxbU4WsJfHJnL6srYxC/T8hUg==", + "version": "1.0.473", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.473.tgz", + "integrity": "sha512-maT1kgspsqqDBYZ5K2Fpze3cB3NwTzl5nQZ9EY7CFjkiypYRjlFosrkxY8eUXs6hCZy/WmuBEYRjdyobEaqrcA==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 1c134a5a052a..b9463b82dc8e 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.451"; + version = "1.0.473"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-98NiHDb0PrK71I28y7DwDJf2i+mKTQBp22PY4WJh5ig="; + hash = "sha256-SlSS1++pEVtvY3sSDZzoD4K6PiFA8Z6tBX+hfIDrhrY="; }; - npmDepsHash = "sha256-qtBi5OT7UBsCIriO6Fk33gLOFNp5Ae0bT9qN+37b2sg="; + npmDepsHash = "sha256-fEK3CzK66AwHlZyt9ax+r5QGqUCfOw11EMMzA2d337c="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index fdde7e38af04..2859ea5557ec 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - platforms = lib.platforms.all; + # https://github.com/pytorch/cpuinfo/blob/877328f188a3c7d1fa855871a278eb48d530c4c0/CMakeLists.txt#L98 + platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) diff --git a/pkgs/by-name/cr/criticality-score/package.nix b/pkgs/by-name/cr/criticality-score/package.nix index 3a85bcfd4f85..9d1409248466 100644 --- a/pkgs/by-name/cr/criticality-score/package.nix +++ b/pkgs/by-name/cr/criticality-score/package.nix @@ -1,11 +1,11 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, versionCheckHook, }: -buildGoModule rec { +buildGo124Module rec { pname = "criticality-score"; version = "2.0.4"; diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index 77c5ac85ed81..bb7be67a8035 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -15,18 +15,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - # This is like 3.1.1 but the latest working yarn.lock. - # All other changes are for docs with the exception of 768d746cbfcf365c58ad1194c5ccc74c14f3ed3a, which simply adds no-referrer meta tag - version = "3.1.1-unstable-2024-07-14"; + version = "3.1.1-unstable-2025-09-12"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; - rev = "0b1af9db483f80323e782e7834da2a337393e111"; - hash = "sha256-lRJ3lI9UUIaw9GWPEy81Dbf4cu6rClA4VjdWejVQN+g="; + rev = "e70ade555fdccf4e723a90f8a2d46fcf83645c4f"; + hash = "sha256-edsGHc6Hi306aq+TA2g5FL/ZYNfExbcgHS5PWF9O0+0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-KVAZIBM47yp1NWYc2esvTwfoAev4q7Wgi0c73PUZRNw="; + hash = "sha256-r36w3Cz/V7E/xPYYpvfQsdk2QXfCVDYE9OxiFNyKP2s="; }; # - If no settings are passed, use the default config provided by upstream # - Despite JSON being valid YAML (and the JSON passing the config validator), diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 48b7c92f5a30..bfcb23b67c28 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "deck"; - version = "1.47.0"; + version = "1.51.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-k/cAybKJq/s5PcEMjT92dZlue9XpEeeHwICHk8ex3G8="; + hash = "sha256-N9vF51GdaWjILLHUSNPh7E490lorgO0xN6Np5AEkz4Y="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-nKKCz7T6HLCBwQjPV/kpzgtR8yNiZS/Ta0H1DlKaLk8="; + vendorHash = "sha256-G2mRj1IQi8hxVfqpc5JeSyAb3ADlcmCNNZPJGwefx1k="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix index d44e299628a3..7fe9f1aba734 100644 --- a/pkgs/by-name/de/deno/librusty_v8.nix +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -2,11 +2,11 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "137.2.1"; + version = "140.0.0"; shas = { - x86_64-linux = "sha256-1mV+UjvJsIyLFpBGVDrGxr/rqUgKzRRFwgnMyYTb/pM="; - aarch64-linux = "sha256-Rp7chA+GjsozCkMQrDnOoi4VhVJdrFZd1BuLfcRhGjw="; - x86_64-darwin = "sha256-tDMk+F6D/h4osYlzT2qAhqfHYUSDk3nL4RxEKjhBhD0="; - aarch64-darwin = "sha256-1eBUjKFalb/CIPfHYP8SvqIaxRep8vU6u9QFShOMUsQ="; + x86_64-linux = "sha256-wQHvnrOPEp/rs+YV3NFcfq+Xg+XouxYOD8zev+bjJHw="; + aarch64-linux = "sha256-RR5h2TIxwMEDtML12Ko1FxEcPNUFZ+YXMrX+ur0Njm8="; + x86_64-darwin = "sha256-+MCp9CQvZw0OnEmKWMNYQTCPs+ueSCqAHsJn/BX/QGI="; + aarch64-darwin = "sha256-l7AtIA92PDY6zsr1bjcTSPlW2tzRvOfyzNskp0Fm0Io="; }; } diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index d474bd602660..6f269129ec25 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -29,17 +29,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-kzY/ZT5Ld6oQnl8vHBaMfdAgZljTcWCFafIbuRS21ro="; + hash = "sha256-N5TDKQKgmVCUevjJKIXJYje3bIBPXKLX53kQP7DdSUA="; }; - cargoHash = "sha256-A1LABL99mXson3gw8CaDbMH4afzyGMcaK0A8+aeK7T0="; + cargoHash = "sha256-oGkM9kvPM3HU8SGj7Hpe6xcy5dzjGxEyKjck68CpeBA="; patches = [ # Patch out the remote upgrade (deno update) check. @@ -187,6 +187,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=watcher" "--skip=node_unit_tests::_fs_watch_test" "--skip=js_unit_tests::fs_events_test" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959 + "--skip=tests::test_userspace_resolver" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix index 8f4d70d146c4..86989d891ed5 100644 --- a/pkgs/by-name/di/diamond/package.nix +++ b/pkgs/by-name/di/diamond/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.13"; + version = "2.1.14"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-1y1eBOmWxZSPKX/VWo1tyimDxqyabOpyP6fX1CcL9sU="; + sha256 = "sha256-w6+lSc2YZ1PwPj3p6ieI/yTkoiSLWH2Za863n4BTClo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 433e6178adac..50303772153a 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -9,14 +9,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "discover-overlay"; - version = "0.7.8"; + version = "0.7.9"; pyproject = true; src = fetchFromGitHub { owner = "trigg"; repo = "Discover"; tag = "v${version}"; - hash = "sha256-0b0uZDa9Q3pQ6X65C+E31dMpdTPt4vvHDEqFEtRoedg="; + hash = "sha256-Z554/zRikZztdD4NZiDDjMWgIlnQDGkemlA3ONRhqR8="; }; buildInputs = [ diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix deleted file mode 100644 index 773791e299d2..000000000000 --- a/pkgs/by-name/dq/dqlite/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch2, - autoreconfHook, - pkg-config, - file, - libuv, - raft-canonical, - sqlite, - lxd-lts, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dqlite"; - version = "1.18.1"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "dqlite"; - tag = "v${finalAttrs.version}"; - hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ="; - }; - - patches = [ - (fetchpatch2 { - url = "https://github.com/canonical/dqlite/commit/be453628ce782167f6652c055e600908e2641da7.patch?full_index=1"; - hash = "sha256-5DvZ1TW6QmE/heh/RjV395gSgwKM5XnqxqznfYQPC/Y="; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - file - pkg-config - ]; - buildInputs = [ - libuv - raft-canonical.dev - sqlite - ]; - - enableParallelBuilding = true; - - # tests fail - doCheck = false; - - outputs = [ - "dev" - "out" - ]; - - passthru.tests = { - inherit lxd-lts; - }; - - meta = { - description = '' - Expose a SQLite database over the network and replicate it across a - cluster of peers - ''; - homepage = "https://dqlite.io/"; - license = lib.licenses.asl20; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 5f5f5dadfbf8..6e825bf2676e 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-08-04"; + version = "4.0.0-unstable-2025-08-31"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "646918e419c98747f4e6f8305c0ecaf6bbc860c6"; - hash = "sha256-8p9IS5aMZGP/VCuFTjQU+D3wfFIwfT/lcY7ujUv3SRc="; + rev = "1e6067a6b9246c0bddd4655d962f90e110f842f6"; + hash = "sha256-UWon2riHFD1szSQglwUBePuiTsk0znj01MZmJwvPGGM="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 371f16115900..7abbbb169cd6 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.97.1"; + version = "1.98.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = "amazon-ecs-agent"; - hash = "sha256-o4jvB15YZdZGbUyvKkHvJRKpzBBsuSt1cObADRw6dco="; + hash = "sha256-zp1Rdl6Gl24hXFNMZX3qcf7p3eAdzE0EA5ZnwjW4guU="; }; vendorHash = null; diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix index 3d0eef9ea368..06e57581f319 100644 --- a/pkgs/by-name/en/ente-desktop/package.nix +++ b/pkgs/by-name/en/ente-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchYarnDeps, nodejs, - electron_35, + electron_37, yarnConfigHook, copyDesktopItems, vips, @@ -15,7 +15,7 @@ imagemagick, }: let - electron = electron_35; + electron = electron_37; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 65b71e8b74a8..e48e115a2af5 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -8,10 +8,17 @@ yarnBuildHook, nix-update-script, extraBuildEnv ? { }, + # This package contains serveral sub-applications. This specifies which of them you want to build. + enteApp ? "photos", + # Accessing some apps (such as account) directly will result in a hardcoded redirect to ente.io. + # To prevent users from accidentally logging in to ente.io instead of the selfhosted instance, you + # can set this parameter to override these occurrences with your own url. Must include the schema. + # Example: https://my-ente.example.com + enteMainUrl ? null, }: stdenv.mkDerivation (finalAttrs: { - pname = "ente-web"; + pname = "ente-web-${enteApp}"; version = "1.2.4"; src = fetchFromGitHub { @@ -38,14 +45,31 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/ente-io/ente/blob/main/web/apps/photos/.env env = extraBuildEnv; - installPhase = '' - runHook preInstall + # Replace hardcoded ente.io urls if desired + postPatch = lib.optionalString (enteMainUrl != null) '' + substituteInPlace \ + apps/payments/src/services/billing.ts \ + apps/photos/src/pages/shared-albums.tsx \ + --replace-fail "https://ente.io" ${lib.escapeShellArg enteMainUrl} - cp -r apps/photos/out $out - - runHook postInstall + substituteInPlace \ + apps/accounts/src/pages/index.tsx \ + --replace-fail "https://web.ente.io" ${lib.escapeShellArg enteMainUrl} ''; + yarnBuildScript = "build:${enteApp}"; + installPhase = + let + distName = if enteApp == "payments" then "dist" else "out"; + in + '' + runHook preInstall + + cp -r apps/${enteApp}/${distName} $out + + runHook postInstall + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" @@ -54,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Web client for Ente Photos"; + description = "Ente application web frontends"; homepage = "https://ente.io/"; changelog = "https://github.com/ente-io/ente/releases"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ pinpox + oddlama ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/en/envconsul/package.nix b/pkgs/by-name/en/envconsul/package.nix index 35e06980b15e..8e4991c5ec5b 100644 --- a/pkgs/by-name/en/envconsul/package.nix +++ b/pkgs/by-name/en/envconsul/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "envconsul"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "envconsul"; rev = "v${version}"; - hash = "sha256-hPq+r4DOMu2elOpaT0xDQoelUb1D/zYM/a6fZZdu/AY="; + hash = "sha256-7F+Zsvh13r38FTxgwKbHSaH9cdnnOl8A+nXSbW4XyXA="; }; - vendorHash = "sha256-0hrZsh08oWqhVqvM6SwUskYToH6Z4YWmV/i0V2MkFMw="; + vendorHash = "sha256-7AXWQ/+rWBGvjkSSWIIGLFY32t3v05GXE7IJwFFsJt4="; ldflags = [ "-s" diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index d64563b41bc0..024b3954f487 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "euphonica"; - version = "0.96.3-beta"; + version = "0.96.4-beta"; src = fetchFromGitHub { owner = "htkhiem"; repo = "euphonica"; tag = "v${finalAttrs.version}"; - hash = "sha256-IxU0LXSh516I2x8keLuuoFwfjVF+Xp0Dc56ryYY6w10="; + hash = "sha256-iPkqTnC5Gg2hnzQ2Lul5aXF5QhYpHQ1MiilvNiKHFdc="; fetchSubmodules = true; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-j4btvkBIQ+SppqE1rvIHWbQSgBn8ORcKGFDXYypEqsA="; + hash = "sha256-AISBkWJ0ZZy2HdZCwW6S5DcD09nVJOmglsoevCaD/3g="; }; mesonBuildType = "release"; diff --git a/pkgs/by-name/fa/fatrace/package.nix b/pkgs/by-name/fa/fatrace/package.nix index d8c6ce4bd191..2b03c02f0f12 100644 --- a/pkgs/by-name/fa/fatrace/package.nix +++ b/pkgs/by-name/fa/fatrace/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fatrace"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = "fatrace"; rev = version; - sha256 = "sha256-QkavhxORENQSLUg4tq+W1WB7zSYYinWOOYPqNbv+pEI="; + sha256 = "sha256-ncLmO7DwkB2nC4K/40ctwRheVVSPDK+zfcGJZvYyuVI="; }; buildInputs = [ diff --git a/pkgs/by-name/fi/fio/package.nix b/pkgs/by-name/fi/fio/package.nix index 776ff1cefcef..a297164ad7aa 100644 --- a/pkgs/by-name/fi/fio/package.nix +++ b/pkgs/by-name/fi/fio/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.40"; + version = "3.41"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-rfO4JEZ+B15NvR2AiTnlbQq++UchPYiXz3vVsFaG6r4="; + sha256 = "sha256-m4JskjSc/KHjID+6j/hbhnGzehPxMxA3m2Iyn49bJDU="; }; buildInputs = [ diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 412d32c9e8d0..06d921eedb2e 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.15.1"; + version = "14.16.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-+wYvxsBnZBvCh98E6Th+uEnxnKnZTKv807mqST8wbJo="; + hash = "sha256-6gChudAEAlZOy++wys+xHS8VmmsLfiGKtHszMWFjLRE="; }; - npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk="; + npmDepsHash = "sha256-r+yMoSgJRwkT1liaH0bAzSx3xLnGjF68OkTNf72pSHg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index edec556fd575..04005009e9c8 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-qApafuIakVlwBiKN0YaYm4KwZAmSqrtXftPEg+VwsJE="; + hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY="; }; - cargoHash = "sha256-Fp3c3ot2ET3gWrqKs+TI4XXjIDFxcEFBBl7irZrsgmE="; + cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 949abee00fa2..fdcfe931b81c 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.0.2"; + version = "4.0.6"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4="; + hash = "sha256-qkPKpZvTVDEV7A/xX2bYgTf+o24mswRDr5UBXOsV5jQ="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg="; + hash = "sha256-myDme0aHEJPUDIcIN3j6i93oPrQ0Li4rIdepBp/C/R4="; }; patches = [ @@ -234,6 +234,7 @@ stdenv.mkDerivation (finalAttrs: { rm tests/pexpects/job_summary.py rm tests/pexpects/signals.py rm tests/pexpects/fg.py + rm tests/checks/fish_exit.fish '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isDarwin) '' # This test seems to consistently fail on aarch64 and darwin diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index a3930bc16962..3ce76eb64f00 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.72.1"; + version = "4.73.1"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-vVBYXn++ZhbgPMDlslTQx+Z1vcOaIMBKtq7Ffmjo6YQ="; + hash = "sha256-/nND13va4S30/5GCzuIL3ZNeOFS07oOmgvxU5d56dm8="; }; - vendorHash = "sha256-DT7hkTpB6yE08SwxsQcqepvJIwQZWvwkqcf2cbQtBRA="; + vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4="; subPackages = [ "cmd/fleet" diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index f398d2395cc9..1cba17d66d1f 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "olm"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = version; - hash = "sha256-/sDWsWOMgDcBYerBbxKWMfWlOUaeQeKQ+OIcE7LJg00="; + hash = "sha256-yGknbxoBMaI6GwIf8hVfWmgFAgI4kxYrNq/puy4aG2M="; }; vendorHash = "sha256-DqZU64jwg2AHmze1oWOmDgltB+k1mLSHQyAxnovLaVo="; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index c2289acd3683..515986bf7a18 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -28,16 +28,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.9.1"; + version = "1.9.4"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-r0/HtRWdlDV749yT2pMnKqQKKYm6FPpcy3eul6M8iDQ="; + hash = "sha256-2tTe8HlkTMHK6W+rLaiOKA/m4yLq63BQP5Pu+Jcxu88="; }; - npmDepsHash = "sha256-OygskQhveT9CiymOOd5gx+aR9v3nMUZj72k/om3IF/c="; + npmDepsHash = "sha256-K3G8t+RwG87Sc7zp/zQZNJmBgezk95bpUpHzqnVaThQ="; nativeBuildInputs = [ esbuild diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix index bffc46e4dab3..9ff2a17e17f4 100644 --- a/pkgs/by-name/fs/fsuae/package.nix +++ b/pkgs/by-name/fs/fsuae/package.nix @@ -17,17 +17,18 @@ stdenv, zip, zlib, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "fs-uae"; - version = "3.1.66"; + version = "3.2.35"; src = fetchFromGitHub { owner = "FrodeSolheim"; repo = "fs-uae"; rev = "v${finalAttrs.version}"; - hash = "sha256-zPVRPazelmNaxcoCStB0j9b9qwQDTgv3O7Bg3VlW9ys="; + hash = "sha256-e+Q+PC6Kpq3OBKsgoRvmu2p9dQfJeRCdFO1agXIGcU8="; }; nativeBuildInputs = [ @@ -58,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: { strip-nondeterminism --type zip $out/share/fs-uae/fs-uae.dat ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://fs-uae.net"; description = "Accurate, customizable Amiga Emulator"; @@ -69,7 +72,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; mainProgram = "fs-uae"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + c4patino + ]; platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86 patterns.isLinux; }; }) diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index e20c8feb646d..1cbe08409dd0 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "fx"; - version = "39.0.4"; + version = "39.1.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "fx"; tag = finalAttrs.version; - hash = "sha256-0zBEyEKy465PZDiZgH+NpermO/7f1GD0hB0wJFbiNz4="; + hash = "sha256-k8BrH3tRc6RM6PG93MRLR/uJGyo953vYH2v4eBBhPrI="; }; - vendorHash = "sha256-7x0nbgMzEJznDH6Wf5iaTYXLh/2IGUSeSVvb0UKKTOQ="; + vendorHash = "sha256-C4TqFRECIFzc6TyAJ2yj97t2BVHXBovIV3iIjNhm7ek="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index a3b92fe8d132..c56fb4a298ba 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-O+wkNb48+8kI8PBhDCkQvhVmApXFrVgNd31B6IMe8JA="; + hash = "sha256-uHLfK6z2Ck38kxGtz91yyWV9YUW/Bft7S/MOUEHMf3o="; }; - vendorHash = "sha256-NUT1VGQ17cBDjdZVxBEqh7UJUGw5G5EtqpF7LXkXAH8="; + vendorHash = "sha256-M4hI9ciDe49siQhFVRFTXNfQBMt9aBulu9+HvCQeVHA="; subPackages = [ "." diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index ddc78892b432..b169a7f26bbc 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gh-f"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; tag = "v${finalAttrs.version}"; - hash = "sha256-rMGyiXniW3M4JnsWufXcsU8mL8KlrIRGGgbQT6utnuc="; + hash = "sha256-quljviONCNnXC7QxTWE64PNt8IYr2GnaYq0cM/Pcl68="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index bf6e5836cfac..a441d61db4a2 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-E1ta3qt0xXOFw9KhQYKt6cLolJ2wkH6JU22NbCWeuf0="; + hash = "sha256-IGjbuW4gPOZQrLMhyrZ3ii/GeRrgEyNVb0w3/Z0hihU="; }; vendorHash = "sha256-F6PR4bxFSixgYQX65zjrVxcxEQxCoavQqa5mBGrZH8o="; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 29fbd5564fc5..ecdbe3ae769e 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.6.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-cYbIXrvo8K63SusPMD4e2MmtHl4h84eiJb30SIHke/0="; + hash = "sha256-7/pa9QG4MojqFcWhuunNEs+4+Z4jI9nMCGinV9YotwA="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-AvDKdyJW4kWh2r6XFDyx9DB3PEJc9a0viHKboOVQATg="; + hash = "sha256-Sf1yaBR2q0TADHIcot7euNL69E1w2FN2JKSvJeZqfkA="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix index bcee9826762f..a4658ef6620d 100644 --- a/pkgs/by-name/gi/gitwatch/package.nix +++ b/pkgs/by-name/gi/gitwatch/package.nix @@ -13,12 +13,12 @@ }: runCommand "gitwatch" rec { - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "gitwatch"; repo = "gitwatch"; rev = "v${version}"; - hash = "sha256-dKXKuqUQhFUXMwPs7Uilzn2yKH6DIlBTOFztKo+PqVU="; + hash = "sha256-DEHhwQvI8i+8ExAQvfY+zL5epmhOkht3a69XOn0cKqY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 24d8207cf5ec..4fdc47797a80 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -2,7 +2,7 @@ lib, fetchurl, fetchFromGitea, - buildGoModule, + buildGo124Module, nixosTests, }: let @@ -17,7 +17,7 @@ let hash = "sha256-et1jguboadjJJdUpugmRvkAtpdfHxn4+ftXUH/hWTdE="; }; in -buildGoModule rec { +buildGo124Module rec { inherit version; pname = repo; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 8632b81a1909..66e93625a943 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule rec { - version = "3.5.3"; + version = "3.5.5"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-3/cI5KiSuHMDe+YqPOnygTbZfWdG9G6dz5RAIXeT4S4="; + hash = "sha256-nNmY3LrRhrTGQBtnjQ2V252cAvJp2F6D2XHCkcvFfn8="; }; vendorHash = null; diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 6d41676d4483..6cde3ea0b05d 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "2025041100"; + version = "2025090300"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - hash = "sha256-HCuH5SUiw/+3T1dv+IKKsQEC1GbuG0Se376bw2fG5u8="; + hash = "sha256-SpcdZIo9YOmVBq2yG4n174gjAoThnnWbQcWK2BfQ2BM="; }; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index 1c4a6c3f34a1..318e8776fa59 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-08-13"; + version = "0-unstable-2025-08-28"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "f9f56cb51ba06d27f5ee8e7b88e20b0b4de6bf4c"; - hash = "sha256-gKJQ2TTh0MJB0SULA2ND8gvZ/YlC1dSxCOr0K2X4So0="; + rev = "2034b4ce9aa30281ff8f3af49b0e53e34a029fd7"; + hash = "sha256-OM5ZkXZxDSYtLS2CbqAjXXJM95plC7VWgvUG0qYbEJI="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix index c43e1d6a56aa..28df2885bb72 100644 --- a/pkgs/by-name/gu/guile-goblins/package.nix +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "guile-goblins"; - version = "0.15.1"; + version = "0.16.1"; src = fetchurl { url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; - hash = "sha256-2oPS6Ar0ee7BQBtjvhJCCQYXK2TLIiADiCwnDaHPGBc="; + hash = "sha256-MLuCcarwqgRtxsMONBsvfvrLz30KF6ztLWAyi1JuzoE="; }; strictDeps = true; diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index f6b377ff5b2e..2f9401cb7c7e 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.3.14"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-WZ0renrLt2OHg0p0JApyuctujinerzPnidlN85LyMi0="; + hash = "sha256-OeZMh3lC3fluwz1pU3JnLRkwFYiIkthGuclYkOJm430="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index a1d6e65a5820..98e8c9cfec3c 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.62.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-rtd/cuTy5n89NZtZf+lbP7jGySYjUnOfgzfziMYg+40="; + hash = "sha256-c24JekkvV+utJoHvpZO8z1XAwbQBBIrGIO+os5NW9Y4="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-ZSyAnlekjBGb0SJW4Ae1EEGwSnsDWXVUfYA0d87Ug1w="; + cargoHash = "sha256-iwESdSCmZIA96ECS4weqxx3n1u8UzYte06Vk/svmm/g="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/he/healthchecks/package.nix b/pkgs/by-name/he/healthchecks/package.nix index 59006dda5532..d3199e611c40 100644 --- a/pkgs/by-name/he/healthchecks/package.nix +++ b/pkgs/by-name/he/healthchecks/package.nix @@ -15,14 +15,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.11"; + version = "3.11.2"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = "healthchecks"; tag = "v${version}"; - sha256 = "sha256-s8qhCp+6d2rixgrduWXopiWEpBCLVKkoDjTYT0eLSN8="; + sha256 = "sha256-EHXxb5T5+WFvhBZQ6d6abSzpBEUBz6F1ftqMWECmdpg="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index e07dccc7a35d..a2a0b2d60a39 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.69.0"; + version = "1.73.2"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-QB2N/RJ4o6IN25qSRbiB69/qGHEKA4GRbLdMYS2cRIQ="; + hash = "sha256-cwKNFGoBKr2RM51uL4uiNHf6oCa0NPBgsXHBe7EPoNM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ht/htmldoc/package.nix b/pkgs/by-name/ht/htmldoc/package.nix index a2652191a926..a61a653af5e8 100644 --- a/pkgs/by-name/ht/htmldoc/package.nix +++ b/pkgs/by-name/ht/htmldoc/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.20"; + version = "1.9.21"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - hash = "sha256-nEDvG2Q6uMYWyb49EKOZimkOfEavCjvfFgucwi3u64k="; + hash = "sha256-MZKXEwJdQzn49JIUm4clqKBTtjKu6tBU5Sdq6ESn1k4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index cc98dc0695ce..26d8bfc32fd0 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -29,9 +29,9 @@ }: let - url = "https://app.hubstaff.com/download/10276-standard-linux-1-7-4-release/sh"; - version = "1.7.4-d4458b13"; - sha256 = "sha256:16ml8ykhrlis2fa3a01cqy5xs6l423ljfsal7gxdnqza7vphayhw"; + url = "https://app.hubstaff.com/download/10606-standard-linux-1-7-5-release/sh"; + version = "1.7.5-a68a2738"; + sha256 = "sha256:19rp5xldhfx48v8hdbvxbvv1j2n3wn5rymm82gryz620kfiandfb"; rpath = lib.makeLibraryPath [ libX11 diff --git a/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch b/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch deleted file mode 100644 index 5e551621e757..000000000000 --- a/pkgs/by-name/hy/hydra-check/fix-cargo-1_88-reqwest.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index bb8d370..7c5b7ac 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -35,6 +35,10 @@ anyhow = "1.0.89" - insta.opt-level = 3 - similar.opt-level = 3 - -+# work around https://github.com/NixOS/nixpkgs/issues/427072 -+[profile.release.package.hyper] -+opt-level = 0 -+ - [lints.clippy] - pedantic = { level = "warn", priority = -1 } - cargo = { level = "warn", priority = -1 } diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix index 4abb7354db7b..494007bbecf5 100644 --- a/pkgs/by-name/hy/hydra-check/package.nix +++ b/pkgs/by-name/hy/hydra-check/package.nix @@ -7,9 +7,12 @@ stdenv, installShellFiles, versionCheckHook, + testers, + curl, + cacert, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: rec { pname = "hydra-check"; version = "2.0.4"; @@ -22,15 +25,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g="; - patches = - lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") - # work around rust 1.88 compiler / linker bug for x86_64-darwin. This is - # applied conditionally because it will introduce a performance penalty on - # other host platforms. NOTE: Please check the patch applies if you update - # the package on a different platform (e.g x86_64-linux). - # see: https://github.com/NixOS/nixpkgs/issues/427072 - ./fix-cargo-1_88-reqwest.patch; - nativeBuildInputs = [ pkg-config installShellFiles @@ -53,6 +47,29 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; + passthru.tests.mainCommand = + testers.runCommand # allows internet access + { + name = "hydra-check-test"; + + # only runs the test when internet access is confirmed: + script = '' + set -e + if curl hydra.nixos.org > /dev/null; then + hydra-check + else + echo "no internet access, skipping test" + fi + touch $out + ''; + + nativeBuildInputs = [ + finalAttrs.finalPackage + curl + cacert # for https connectivity + ]; + }; + meta = { description = "Check hydra for the build status of a package"; homepage = "https://github.com/nix-community/hydra-check"; @@ -65,4 +82,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "hydra-check"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index fc5ed8b97cec..d4d9f379472a 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-AfOG2MCHRp/p894mJhCRRGTLd+DpWKAp3Epf5dR7S/E="; + hash = "sha256-lio5TLy4mtKfoH4kdFh+9l/j974UXF6DrxDWmvKj+Fo="; }; - cargoHash = "sha256-+yjqbTPmfqXGJ85J2+Muhe2/mL1UyBi2XdafY9Mp+Os="; + cargoHash = "sha256-uiyoVi3w3L2DnGlBeuBArYfpaSxDRCQG1sN5mWi+QGU="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index 98882431ff82..0e36d6600a36 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, makeWrapper, + installShellFiles, dbus, libpulseaudio, notmuch, @@ -12,6 +13,7 @@ lm_sensors, iw, iproute2, + pandoc, pipewire, withICUCalendar ? false, withPipewire ? true, @@ -34,6 +36,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper + installShellFiles + pandoc ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]); @@ -59,9 +63,14 @@ rustPlatform.buildRustPackage rec { --replace "/usr/share/i3status-rust" "$out/share" ''; + postBuild = '' + cargo xtask generate-manpage + ''; + postInstall = '' mkdir -p $out/share cp -R examples files/* $out/share + installManPage man/* ''; postFixup = '' diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix index 778de36bbc44..1711200a3c8a 100644 --- a/pkgs/by-name/id/ideamaker/package.nix +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -1,144 +1,71 @@ { - stdenv, autoPatchelfHook, - cacert, common-updater-scripts, + copyDesktopItems, curl, dpkg, + e2fsprogs, fetchurl, - fetchzip, + gnutls, + gtk3, + jq, lib, - libcork, libGLU, + libpsl, libsForQt5, + libredirect, + libX11, + lz4, makeDesktopItem, - openssl, + makeWrapper, + nghttp2, shared-mime-info, + stdenv, writeShellApplication, + xkeyboardconfig, }: -stdenv.mkDerivation (finalAttrs: { +let pname = "ideamaker"; - version = "4.3.3.6560"; - src = - let - semver = lib.strings.concatStringsSep "." ( - lib.lists.init (builtins.splitVersion finalAttrs.version) - ); - in - fetchurl { - url = "https://download.raise3d.com/ideamaker/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb"; - hash = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; - }; + version = "5.2.2.8570"; + semver = lib.strings.concatStringsSep "." (lib.lists.init (builtins.splitVersion version)); + description = "Raise3D's 3D slicer software"; +in +stdenv.mkDerivation { + inherit pname version; + src = fetchurl { + url = "https://downcdn.raise3d.com/ideamaker/release/${semver}/ideaMaker_${version}-ubuntu_amd64.deb"; + hash = "sha256-kXcgVuuPTMWoOCrEztiedJrZrTbFx1xHyzzh4y2b0UA="; + }; nativeBuildInputs = [ autoPatchelfHook + copyDesktopItems dpkg + makeWrapper shared-mime-info - libsForQt5.wrapQtAppsHook ]; - buildInputs = - let - # we need curl 7.47.0, as the app segfaults on launch in 7.47.1 and beyond - # (tested with 7.47.1, 7.50.3, 7.62, 7.79.1, and 8.7.1) - curl_7_47_0 = - let - openssl_1_0_1u = openssl.overrideAttrs (previous: { - version = "1.0.1u"; - src = fetchurl { - url = "https://www.openssl.org/source/openssl-1.0.1u.tar.gz"; - hash = "sha256-QxK0yhIVtvLJcAdQPYDbgNUVf3b499P+u+a0xW/yZzk="; - }; - patches = [ ]; - withDocs = false; - outputs = lib.lists.remove "doc" previous.outputs; - meta.knownVulnerabilities = [ - "OpenSSL 1.0.1 reached its end of life 2016-12-31, see https://endoflife.software/applications/security-libraries/openssl." - "CVE-2021-4044" - "CVE-2016-7056" - ]; - }); - in - (curl.override { - gnutlsSupport = true; - gssSupport = false; - http2Support = false; - # while we use openssl, the configureFlag has since changed, so we manually set it below - opensslSupport = false; - pslSupport = false; - scpSupport = false; - }).overrideAttrs - (previous: { - version = "7.47.0"; - src = fetchzip { - url = "https://curl.se/download/curl-7.47.0.tar.lzma"; - hash = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; - }; - configureFlags = previous.configureFlags ++ [ - "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" - "--with-ssl=${lib.getLib openssl_1_0_1u}" - ]; - patches = [ ]; - # curl https://curl.se/docs/vuln-7.74.0.json | jq -r '.[].id' | sed 's/^/"/;s/$/"/' - meta.knownVulnerabilities = [ - "CURL-CVE-2024-2398" - "CURL-CVE-2023-46218" - "CURL-CVE-2023-38546" - "CURL-CVE-2023-38545" - "CURL-CVE-2023-28322" - "CURL-CVE-2023-28321" - "CURL-CVE-2023-28320" - "CURL-CVE-2023-27538" - "CURL-CVE-2023-27536" - "CURL-CVE-2023-27535" - "CURL-CVE-2023-27534" - "CURL-CVE-2023-27533" - "CURL-CVE-2023-23916" - "CURL-CVE-2022-43552" - "CURL-CVE-2022-32221" - "CURL-CVE-2022-35252" - "CURL-CVE-2022-32208" - "CURL-CVE-2022-32207" - "CURL-CVE-2022-32206" - "CURL-CVE-2022-32205" - "CURL-CVE-2022-27782" - "CURL-CVE-2022-27781" - "CURL-CVE-2022-27776" - "CURL-CVE-2022-27775" - "CURL-CVE-2022-27774" - "CURL-CVE-2022-22576" - "CURL-CVE-2021-22947" - "CURL-CVE-2021-22946" - "CURL-CVE-2021-22945" - "CURL-CVE-2021-22926" - "CURL-CVE-2021-22925" - "CURL-CVE-2021-22924" - "CURL-CVE-2021-22923" - "CURL-CVE-2021-22922" - "CURL-CVE-2021-22898" - "CURL-CVE-2021-22897" - "CURL-CVE-2021-22890" - "CURL-CVE-2021-22876" - ]; - }); - in - [ - (lib.getLib curl_7_47_0) - libcork - libGLU - libsForQt5.qtbase - libsForQt5.qtserialport - libsForQt5.quazip - ]; + dontWrapQtApps = true; + + buildInputs = [ + libGLU + lz4 + e2fsprogs + gnutls + gtk3 + nghttp2 + libpsl + libsForQt5.qtbase + libsForQt5.qt5.qtwayland + ]; installPhase = '' runHook preInstall - install -D usr/lib/x86_64-linux-gnu/ideamaker/ideamaker \ - $out/bin/ideamaker + mkdir -p $out/bin - patchelf --replace-needed libquazip.so.1 libquazip1-qt5.so \ - $out/bin/ideamaker + cp -r usr $out + cp -r usr/share $out/share mimetypeDir=$out/share/icons/hicolor/128x128/mimetypes mkdir -p ''$mimetypeDir @@ -151,70 +78,79 @@ stdenv.mkDerivation (finalAttrs: { install -D usr/share/ideamaker/icons/ideamaker-icon.png \ $out/share/pixmaps/ideamaker.png - ln -s ${finalAttrs.desktopItem}/share/applications $out/share/ + ln -sf $out/usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin/ideamaker runHook postInstall ''; - desktopItem = makeDesktopItem { - name = "ideamaker"; - exec = "ideamaker"; - icon = "ideamaker"; - desktopName = "Ideamaker"; - comment = "ideaMaker - www.raise3d.com"; - categories = [ - "Qt" - "Utility" - "3DGraphics" - "Viewer" - "Engineering" - ]; - genericName = finalAttrs.meta.description; - mimeTypes = [ - "application/x-ideamaker" - "model/3mf" - "model/obj" - "model/stl" - "text/x.gcode" - ]; - noDisplay = false; - startupNotify = true; - terminal = false; - type = "Application"; - }; + preFixup = '' + wrapProgram $out/bin/ideamaker \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ + --set QTCOMPOSE "${libX11.out}/share/X11/locale" \ + --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \ + --set NIX_REDIRECTS /usr/share=$out/share/ + ''; + + postFixup = '' + patchelf \ + --add-needed libdbus-1.so.3 \ + "$out/usr/lib/x86_64-linux-gnu/ideamaker/libQt5DBus.so.5.15.2" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ideamaker"; + exec = "ideamaker"; + icon = "ideamaker"; + desktopName = "Ideamaker"; + comment = "ideaMaker - www.raise3d.com"; + categories = [ + "Qt" + "Utility" + "3DGraphics" + "Viewer" + "Engineering" + ]; + genericName = description; + mimeTypes = [ + "application/x-ideamaker" + "model/3mf" + "model/obj" + "model/stl" + "text/x.gcode" + ]; + noDisplay = false; + startupNotify = true; + terminal = false; + type = "Application"; + }) + ]; passthru.updateScript = lib.getExe (writeShellApplication { name = "ideamaker-update-script"; runtimeInputs = [ curl common-updater-scripts + jq ]; text = '' - set -eu -o pipefail - - release_page=$(mktemp) - curl -s https://www.raise3d.com/download/ideamaker-all-versions/ > "$release_page" - - latest_stable_version=$( - sed -nE '/Beta|Alpha/! s/.*Version ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' "$release_page" | \ - head -n 1 - ) - - latest_stable_build_number=$( - sed -nE "s/.*ideaMaker_$latest_stable_version\.([0-9]+).*/\1/p" "$release_page" | head -n 1 - ) - - update-source-version ideamaker "$latest_stable_version.$latest_stable_build_number" + update-source-version ideamaker "$( + curl 'https://api.raise3d.com/ideamakerio-v1.1/hq/ofpVersionControl/find' -X 'POST' \ + | jq -r '.data.release_version.linux_64_deb_url' \ + | sed -E 's#.*/release/([0-9]+\.[0-9]+\.[0-9]+)/ideaMaker_\1\.([0-9]+).*#\1.\2#' + )" ''; }); meta = { - homepage = "https://www.raise3d.com/ideamaker/"; + inherit description; changelog = "https://www.raise3d.com/download/ideamaker-release-notes/"; - description = "Raise3D's 3D slicer software"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + homepage = "https://www.raise3d.com/ideamaker/"; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; + mainProgram = "ideamaker"; maintainers = with lib.maintainers; [ cjshearer ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -}) +} diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix index 71a4370f70fc..137dff309b13 100644 --- a/pkgs/by-name/ii/iio-hyprland/package.nix +++ b/pkgs/by-name/ii/iio-hyprland/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "iio-hyprland"; - version = "0-unstable-2025-06-11"; + version = "0-unstable-2025-08-21"; src = fetchFromGitHub { owner = "JeanSchoeller"; repo = "iio-hyprland"; - rev = "f7ae269294bc812e966b9b60b89beefcdfd68821"; - hash = "sha256-tWMjZ5DktOIvgl45RRgaOF0x5Kj5gsKZG79LGNLyw58="; + rev = "282f38c700ebf0b69df5aae40134d56e4cd67775"; + hash = "sha256-mzp2KV9SAsZL/exXSZHFPArcTV8uh3LXufADKX4ppEU="; }; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index ca2237400471..c60c6b1e1d55 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.60.8"; + version = "0.62.2"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-k3SkjLjtCRionDwi2S/pZ40ShKgbsbQhBuLAs3Kd458="; + hash = "sha256-dtRQeB2E/setGm0DEM/ikywU0LIRhOOjyRV0yuvuJQU="; }; - cargoHash = "sha256-i9mFQ12z3YE6Kb89Tt27reG1Y3rUmzTkAlT4Zd8rgXg="; + cargoHash = "sha256-EGIBBriAhqeAUQqlWPcAGdBAYWmYYnvc3ncYGc0ir3o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ip/ip2location-c/package.nix b/pkgs/by-name/ip/ip2location-c/package.nix index 929e5772b572..ec8ce55bfecc 100644 --- a/pkgs/by-name/ip/ip2location-c/package.nix +++ b/pkgs/by-name/ip/ip2location-c/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ip2location-c"; - version = "8.6.1"; + version = "8.7.0"; src = fetchFromGitHub { owner = "chrislim2888"; repo = "IP2Location-C-Library"; rev = version; - sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY="; + sha256 = "sha256-kp0tNZPP9u2xxFOmBAdivsVLtyF66o38H6eRrs2/S/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index 9a8845d9eded..cc056602a991 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -7,20 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.15.1"; + version = "1.15.2"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; tag = "v${version}"; - hash = "sha256-ZA4q2Z3X9zhzW/TH8aRliVij8UxqDVUamhKcfVxWb/c="; + hash = "sha256-g/gQb9QOyfa7kyHCUZf/kLZRO5IE8389BUCYz8Sqr8o="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'packaging = "^23.0"' 'packaging = "*"' \ - --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' + --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' \ + --replace-fail 'redis = "^5.0.0"' 'redis = "*"' ''; nativeBuildInputs = with python3.pkgs; [ @@ -64,12 +65,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "iredis" ]; - meta = with lib; { + meta = { description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; changelog = "https://github.com/laixintao/iredis/blob/${src.tag}/CHANGELOG.md"; homepage = "https://iredis.xbin.io/"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "iredis"; }; } diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 437b4f92c9c5..187e3422b983 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.76.1"; + version = "1.76.2"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-rNPB+POWDT6DKoqowHFmojNluFWjd+lXzYYsc9I6ebU="; + hash = "sha256-bZKFoN6hr/TLTvGAWUXS+S3RnYhdirUeGz30LYbgA7g="; }; - cargoHash = "sha256-OGK5CzDuA1sWmZgh2OCQBiTvGLdTjMALFnPXM5pYZo4="; + cargoHash = "sha256-lcnKiJCFN/bN/4R6VIhut2Xz3ueYPgXkr4dsYH57d9g="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix index 449bade34ce2..4e954f7018bf 100644 --- a/pkgs/by-name/is/isle-portable/package.nix +++ b/pkgs/by-name/is/isle-portable/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; name = "isle-portable"; - version = "0-unstable-2025-08-21"; + version = "0-unstable-2025-09-12"; src = fetchFromGitHub { owner = "isledecomp"; repo = "isle-portable"; - rev = "ef2eaf04bf09c8827139ad4c06cea24ea8ab6942"; - hash = "sha256-rOF8DZck3TVvfP4Ho4hvlAZmhAhbGD+Q91yk/pvXv3o="; + rev = "ec3c770c61a717e8da1006beeda384533e235f8c"; + hash = "sha256-XzPHthUYSDj9gleq0Tnhe79xIU2X57ZqMzND53q8+sI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix index 412e7d72fb0c..ba66f828709c 100644 --- a/pkgs/by-name/is/isolate/package.nix +++ b/pkgs/by-name/is/isolate/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "isolate"; - version = "2.1.2"; + version = "2.2"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${version}"; - hash = "sha256-B2uo9J5RjDF2JtCWrW3WE1osLYebeAxXUQHnTs0rfBk="; + hash = "sha256-AacKIRS/Ah1KoE+bz+lK2GPbS3F3ifBGXvvCFWMd7hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index 044d83fe0bc9..1c0d8690b8a4 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.78.8"; + version = "2.78.10"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${version}"; - hash = "sha256-NaCzNjDIUr0u/+WQmJbJrLyMPf8Z974ulmu4VYa+jcs="; + hash = "sha256-o3H+onnvGFGxUtFRYFHmrEQ5EqQCGP8n/NdqdEHNj84="; }; proxyVendor = true; - vendorHash = "sha256-74FD0wx+RIwvzVT4034A+gNyNWP4soosLna2TpqUxmk="; + vendorHash = "sha256-jzjYFnctUwQUVC59JIsrHTIWCqYiZTurNFLn9zuM+18="; checkFlags = "-skip=^TestReleaseBundle"; diff --git a/pkgs/by-name/ju/juicefs/package.nix b/pkgs/by-name/ju/juicefs/package.nix index bfcf85230495..4fdf59ee3027 100644 --- a/pkgs/by-name/ju/juicefs/package.nix +++ b/pkgs/by-name/ju/juicefs/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "juicedata"; repo = "juicefs"; rev = "v${version}"; - hash = "sha256-qe8uhSSLeOsr0FmgoOVeZeIpP4Bv5/Viz5N90PGdc9o="; + hash = "sha256-JQckOEoM40K5Tlq1Ti/vBIDdKqrtfnfy3JeJmp9K93o="; }; - vendorHash = "sha256-TIcxqMMsihV3Rf8WpQM/Ct9CNs3gBKBIx6myXHfca+s="; + vendorHash = "sha256-LE6bpFSHhIRKaGlgn8nU8leOfcNH1ruKRv3vHZu0n/s="; excludedPackages = [ "sdk/java/libjfs" ]; diff --git a/pkgs/by-name/jx/jxplorer/package.nix b/pkgs/by-name/jx/jxplorer/package.nix index eea1c6a6a7de..e0e324fb3ab8 100644 --- a/pkgs/by-name/jx/jxplorer/package.nix +++ b/pkgs/by-name/jx/jxplorer/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Java Ldap Browser"; homepage = "https://sourceforge.net/projects/jxplorer/"; - license = lib.licenses.caossl; + license = lib.licenses.asl11; maintainers = with maintainers; [ benwbooth ]; platforms = platforms.linux; mainProgram = "jxplorer"; diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json index e7400f04c2ca..8bd6c1ed1720 100644 --- a/pkgs/by-name/ka/kazumi/gitHashes.json +++ b/pkgs/by-name/ka/kazumi/gitHashes.json @@ -1,5 +1,5 @@ { - "desktop_webview_window": "sha256-GcTwBQKPFwG6fVYd9v2HVvc/Meyxmc8cD5GcgcnPpgo=", + "desktop_webview_window": "sha256-l5n57iKLgsH4TaBYRaTDEPznzljI0jfOGcvxyYcIW6M=", "media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", "media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", "media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=", diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index f4ef0f824bc8..eac537c20731 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -17,13 +17,13 @@ }: let - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-t+RhLzfQwiBa49BCZ0qeUijAylPWYR8UYZHKk6bVgZc="; + hash = "sha256-EHrTI+jy8ryvGwLUJNVbYlinKsBxh12zboHqpiGuRk0="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index f1f9262e33fb..adde10461b70 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -224,11 +224,11 @@ "dependency": "direct main", "description": { "name": "card_settings_ui", - "sha256": "69946704bf4e05830e4737645188f14420285063c8e15f82ef8f5708dba55df8", + "sha256": "73670e4685d44fed8e9669e813153801825eea6f7a2845665e3a5a8631761e6c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "characters": { "dependency": "transitive", @@ -394,8 +394,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "user_script", - "resolved-ref": "0372b6b20c7d48b5777180b8d3cb0124f2e6b061", + "ref": "main", + "resolved-ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44", "url": "https://github.com/Predidit/linux_webview_window.git" }, "source": "git", @@ -2223,6 +2223,6 @@ }, "sdks": { "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.35.1" + "flutter": ">=3.35.3" } } diff --git a/pkgs/by-name/ke/kernel-hardening-checker/package.nix b/pkgs/by-name/ke/kernel-hardening-checker/package.nix index 3a740ab73db7..44ba1cfa0b13 100644 --- a/pkgs/by-name/ke/kernel-hardening-checker/package.nix +++ b/pkgs/by-name/ke/kernel-hardening-checker/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "kernel-hardening-checker"; - version = "0.6.10"; + version = "0.6.10.2"; format = "pyproject"; src = fetchFromGitHub { owner = "a13xp0p0v"; repo = "kernel-hardening-checker"; rev = "v${version}"; - hash = "sha256-gxDaOb14jFezxe/qHZF3e52o7obVL0WMIKxwIj3j5QY="; + hash = "sha256-9FhDDKTx/YwlEuGf7fgugC5tPgslzXZdlXCCfuM09Dg="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index f5bdf9a49fbb..bda1cd85fd01 100644 --- a/pkgs/by-name/ke/keymapper/package.nix +++ b/pkgs/by-name/ke/keymapper/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.12.3"; + version = "5.0.0"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; tag = finalAttrs.version; - hash = "sha256-ygy83eTibkxuC+1gK3eHDv0WK8wlzYTIPEJ2NAaWgo0="; + hash = "sha256-3cUfgOuZ3GKSKbUI2k/MwvSmHtqvqiUvqUem3Nh/YuQ="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix index 9de0c450d0ce..a6a334412863 100644 --- a/pkgs/by-name/la/lammps/package.nix +++ b/pkgs/by-name/la/lammps/package.nix @@ -49,14 +49,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "29Aug2024_update4"; + version = "22Jul2025_update1"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-eoRD6wYuMda3EJvdeKvNuHNHW/UthZ5oe7KE15LniFk="; + hash = "sha256-w0SQjckqtvTKDP5zRX9QJGd5vT9HamsRwwCmEMqkZEM="; }; preConfigure = '' cd cmake diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index b991fc9f3a68..50485017bcdc 100644 --- a/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lbreakouthd"; - version = "1.1.11"; + version = "1.2"; src = fetchurl { url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; - hash = "sha256-QFqNGv2+XXe1Dt8HAoqXEHWXFNU/IQ2c9FYEqehrWdI="; + hash = "sha256-ZEy/b2ZWAZvDNbAu/FnpsPo8WsvSGADbdaSXU/gpdBk="; }; # On macOS with a case-insensitive filesystem, "sdl.h" shadows diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix index c0cffc352d11..001250e0ad4e 100644 --- a/pkgs/by-name/li/libdigidocpp/package.nix +++ b/pkgs/by-name/li/libdigidocpp/package.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; pname = "libdigidocpp"; src = fetchFromGitHub { owner = "open-eid"; repo = "libdigidocpp"; tag = "v${version}"; - hash = "sha256-o/2hF82uRaBDp7I9urn8R6r9YQMkp241M1v92qD66NM="; + hash = "sha256-YWpehK/Gkb4c81KGbXzZoagTdcE94tSKWLh+BBZ3rKY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index 27d18d8412d1..a45beb0e27f2 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmpdclient"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${finalAttrs.version}"; - hash = "sha256-8/BE8K3e6U9i8/ByfKaCQgzcWFXOGGoES3gYoTx+jQg="; + hash = "sha256-VACe7/RnKgoA3qRIWmjFhCW+GVk9qUGp4+tSXMTo8Bk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/librelp/package.nix b/pkgs/by-name/li/librelp/package.nix index 00e8ef09be0a..5c4b6eeb2822 100644 --- a/pkgs/by-name/li/librelp/package.nix +++ b/pkgs/by-name/li/librelp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "sha256-VJlvFiOsIyiu0kBU8NkObtt9j2ElrSzJtvE8wtSlOus="; + sha256 = "sha256-VWW5EM1INxBACoQsIN+mxsJjUKDFbfh2mqdvB/3W6Xw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 53ff715125d3..56474e009923 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -330,7 +330,7 @@ stdenv.mkDerivation rec { (feat "udev" isLinux) (feat "json_c" true) - (driver "ch" isLinux) + (driver "ch" (isLinux && (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64))) (driver "esx" true) (driver "interface" isLinux) (driver "libvirtd" true) diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 51ecd3f05174..4e648abbc999 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.81"; + version = "1.4.82"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-19QsP9L9lLY8kVqn0Y9No8rFk33boz6Qn4HPUIQqWEA="; + sha256 = "sha256-q/50OR+cvWarFU6gfmTxlNvn6QbvTtR+s7DztGJGyWI="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix index 73a3614dc8bd..3e1041817547 100644 --- a/pkgs/by-name/lo/localstack/package.nix +++ b/pkgs/by-name/lo/localstack/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "localstack"; - version = "4.6.0"; + version = "4.8.0"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; tag = "v${version}"; - hash = "sha256-95jg/FmeES64DSMPvWWaNXIxOTOtwvvXixZAgxWMqYo="; + hash = "sha256-FxbfqCblVuJ5KCy9QhyK83psgF9RvsAWMw7cbrz7NVo="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix index 036eba73851a..6588e726f57c 100644 --- a/pkgs/by-name/lo/logcheck/package.nix +++ b/pkgs/by-name/lo/logcheck/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.4.6"; + version = "1.4.7"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-HAOKyL/OVR6E175QIr/VZILy1w7mqMt6RJkifzGLYn0="; + sha256 = "sha256-zBYMvKwo85OI6LluRixOYtAFRTtpV/Hw6qjAk/+c898="; }; prePatch = '' diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix index 5c8d02f446fe..f438a33b5465 100644 --- a/pkgs/by-name/ls/lsof/package.nix +++ b/pkgs/by-name/ls/lsof/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - license = lib.licenses.purdueBsd; + license = lib.licenses.lsof; maintainers = with lib.maintainers; [ dezgeg ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/lx/lxd-lts/package.nix b/pkgs/by-name/lx/lxd-lts/package.nix deleted file mode 100644 index ef61e0a7bcce..000000000000 --- a/pkgs/by-name/lx/lxd-lts/package.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ - lib, - lxd-unwrapped-lts, - linkFarm, - makeWrapper, - stdenv, - symlinkJoin, - writeShellScriptBin, - acl, - apparmor-parser, - apparmor-profiles, - attr, - bash, - btrfs-progs, - cdrkit, - criu, - dnsmasq, - e2fsprogs, - getent, - gnutar, - gptfdisk, - gzip, - iproute2, - iptables, - kmod, - lvm2, - minio, - nftables, - OVMF, - qemu_kvm, - qemu-utils, - rsync, - spice-gtk, - squashfsTools, - thin-provisioning-tools, - util-linux, - virtiofsd, - xz, -}: -let - binPath = lib.makeBinPath [ - acl - attr - bash - btrfs-progs - cdrkit - criu - dnsmasq - e2fsprogs - getent - gnutar - gptfdisk - gzip - iproute2 - iptables - kmod - lvm2 - minio - nftables - qemu_kvm - qemu-utils - rsync - squashfsTools - thin-provisioning-tools - util-linux - virtiofsd - xz - - (writeShellScriptBin "apparmor_parser" '' - exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" - '') - ]; - - clientBinPath = [ spice-gtk ]; - - ovmf-2mb = OVMF.override { - secureBoot = true; - fdSize2MB = true; - }; - - ovmf-4mb = OVMF.override { - secureBoot = true; - fdSize4MB = true; - }; - - ovmf-prefix = if stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF"; - - # mimic ovmf from https://github.com/canonical/lxd-pkg-snap/blob/3abebe1dfeb20f9b7729556960c7e9fe6ad5e17c/snapcraft.yaml#L378 - # also found in /snap/lxd/current/share/qemu/ on a snap install - ovmf = linkFarm "lxd-ovmf" [ - { - name = "OVMF_CODE.2MB.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; - } - { - name = "OVMF_CODE.4MB.fd"; - path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; - } - { - name = "OVMF_CODE.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; - } - - { - name = "OVMF_VARS.2MB.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { - name = "OVMF_VARS.2MB.ms.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { - name = "OVMF_VARS.4MB.fd"; - path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { - name = "OVMF_VARS.4MB.ms.fd"; - path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { - name = "OVMF_VARS.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { - name = "OVMF_VARS.ms.fd"; - path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - ]; -in -symlinkJoin { - name = "lxd-${lxd-unwrapped-lts.version}"; - - paths = [ lxd-unwrapped-lts ]; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/lxd --prefix PATH : ${lib.escapeShellArg binPath}:${qemu_kvm}/libexec:$out/bin --set LXD_OVMF_PATH ${ovmf} - - wrapProgram $out/bin/lxc --prefix PATH : ${lib.makeBinPath clientBinPath} - ''; - - passthru = { - inherit (lxd-unwrapped-lts) tests; - }; - - inherit (lxd-unwrapped-lts) meta pname version; -} diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix deleted file mode 100644 index d7ef2ec7c328..000000000000 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchYarnDeps, - nodejs, - fixup-yarn-lock, - yarn, - nixosTests, - nix-update-script, -}: - -stdenv.mkDerivation rec { - pname = "lxd-ui"; - version = "0.16"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "lxd-ui"; - tag = version; - hash = "sha256-JVozXgAu0rTjO9aNzKMzzoGYL09lRzNI5qcjDfRaMnE="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-Z/C0QgqxBWob6KIWuU8PACkTKuAhTrJzod9WNXTO8Zs="; - }; - - nativeBuildInputs = [ - nodejs - fixup-yarn-lock - yarn - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r build/ui/ $out - - runHook postInstall - ''; - - passthru.tests.default = nixosTests.lxd.ui; - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Web user interface for LXD"; - homepage = "https://github.com/canonical/lxd-ui"; - changelog = "https://github.com/canonical/lxd-ui/releases/tag/${version}"; - license = lib.licenses.gpl3; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix deleted file mode 100644 index c924b449db26..000000000000 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - lib, - hwdata, - pkg-config, - lxc, - buildGoModule, - fetchFromGitHub, - acl, - libcap, - dqlite, - raft-canonical, - sqlite, - udev, - installShellFiles, - nixosTests, - nix-update-script, -}: - -buildGoModule rec { - pname = "lxd-unwrapped-lts"; - # major/minor are used in updateScript to pin to LTS - version = "5.21.2"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "lxd"; - tag = "lxd-${version}"; - hash = "sha256-3C5pLvO7oABWFhFiWtBr5ohFFWm20Gg36WBfVVJgKdc="; - }; - - vendorHash = "sha256-W7+Z2o5cw3u0DbTZA+a3pRXt9zRggUUjFTUTtQ7B22A="; - - postPatch = '' - substituteInPlace shared/usbid/load.go \ - --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" - ''; - - excludedPackages = [ - "test" - "lxd/db/generate" - "lxd-agent" - "lxd-migrate" - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - buildInputs = [ - lxc - acl - libcap - dqlite.dev - raft-canonical.dev - sqlite - udev.dev - ]; - - ldflags = [ - "-s" - "-w" - ]; - tags = [ "libsqlite3" ]; - - preBuild = '' - # required for go-dqlite. See: https://github.com/canonical/lxd/pull/8939 - export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" - ''; - - # build static binaries: https://github.com/canonical/lxd/blob/6fd175c45e65cd475d198db69d6528e489733e19/Makefile#L43-L51 - postBuild = '' - make lxd-agent lxd-migrate - ''; - - checkFlags = - let - skippedTests = [ - "TestValidateConfig" - "TestConvertNetworkConfig" - "TestConvertStorageConfig" - "TestSnapshotCommon" - "TestContainerTestSuite" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - - postInstall = '' - installShellCompletion --bash --name lxd ./scripts/bash/lxd-client - ''; - - passthru = { - tests.lxd = nixosTests.lxd; - tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; - - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "lxd-(5.21.*)" - ]; - }; - }; - - meta = { - description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = "https://ubuntu.com/lxd"; - changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = with lib.licenses; [ - asl20 - agpl3Plus - ]; - maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index b370bd008135..55a02df863a5 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.22.3", - "hash": "sha256-op81+/+W14xpQxYk7oH2V9Ldsw5oAxiI09qp9LhYnCg=" + "version": "5.24.1", + "hash": "sha256-yylPew/CKeBHrVw3mqLpGRb4osZhNBpZRCqOoEydXL0=" }, "beta": { - "version": "5.23.0-beta.1", - "hash": "sha256-AY1ijgljSdwHHlz5FnIzyeGX1bCfyerCrhG/CTQNYG8=" + "version": "5.24.1", + "hash": "sha256-yylPew/CKeBHrVw3mqLpGRb4osZhNBpZRCqOoEydXL0=" } } diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index 15d9958ff143..4bbd6dd8e167 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-conduit"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; tag = "v${finalAttrs.version}"; - hash = "sha256-wSh1RPJt0gXp1U4aCBUASSVmvmroTPyhxpH1Exik4ds="; + hash = "sha256-rJyuR8Ie/JiNKNjQL21+Q1PWliEAm+lwGraGeDxEHyY="; }; - cargoHash = "sha256-3wQGKeLfBeASj82xqAXRhcuESX3CEgkf9P4K/AvquvQ="; + cargoHash = "sha256-4ZA+3f8Kt+1JAm9KXnMRxAF+X9z8HSJoJe6Ny63SlnA="; # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. preBuild = '' diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix index 2813cda8a4fe..bc6b559370d8 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/shared-secret-auth.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "matrix-synapse-shared-secret-auth"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; src = fetchFromGitHub { owner = "devture"; repo = "matrix-synapse-shared-secret-auth"; rev = version; - sha256 = "sha256-qzXKwTEOMtdvsxoU3Xh3vQyhK+Q18LfkeSts7EyDIXE="; + sha256 = "sha256-ZMEUBC2Y4J1+4tHfsMxqzTO/P1ef3aB81OAhEs+Tdc4="; }; doCheck = false; diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 36cddb9a1c96..ce2bf85ac5b2 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.0.54"; + version = "0.0.55"; in buildGoModule { @@ -20,7 +20,7 @@ buildGoModule { repo = "mcap"; owner = "foxglove"; rev = "releases/mcap-cli/v${version}"; - hash = "sha256-b1Ngj8k2ZkI47lTwbLWTojtoMWQ54eJ8QN5Qd5ot9n4="; + hash = "sha256-3HV7FNlS91J089FgtKOQEXCzQEoDR39w0kBB8H88rSw="; }; vendorHash = "sha256-twuXJXiGhjTqlEZ3xD8G9CruSLxFC33PMs2GZadl1Ow="; diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index 9b3df51ff0ad..c0c5546aabef 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; tag = version; - sha256 = "sha256-dZUJjilfzl8u/KdBS1iKaAwOXWYAIMDi55ZAYtyuuOI="; + sha256 = "sha256-FzuURsGob9ZQC0C18wKLhamCyARirtvGLq5lF64JOX8="; }; patchPhase = '' diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 4968f0cffd84..d6e4bb1fc27a 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -1,21 +1,32 @@ { - lib, - stdenv, + autoPatchelfHook, fetchurl, jre, + lib, makeWrapper, + sourcesJSON ? ./sources.json, + stdenvNoCC, + zlib, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.12.14"; + version = "1.0.4"; - src = fetchurl { - url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}.exe"; - hash = "sha256-2MyufFcgKH/bxVB83qXNESByAdgbzhyIHqAr36Bb9o0="; - }; + src = + let + source = (lib.importJSON sourcesJSON)."${stdenvNoCC.hostPlatform.system}"; + in + fetchurl { + url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${source.artifact-suffix}/${finalAttrs.version}/mill-dist-${source.artifact-suffix}-${finalAttrs.version}.exe"; + inherit (source) hash; + }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ zlib ]; + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; dontUnpack = true; dontConfigure = true; @@ -26,19 +37,14 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm555 "$src" "$out/bin/.mill-wrapped" - # can't use wrapProgram because it sets --argv0 - makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \ - --prefix PATH : "${jre}/bin" \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; - doInstallCheck = true; - # The default release is a script which will do an impure download - # just ensure that the application can run without network - installCheckPhase = '' - $out/bin/mill --help > /dev/null + install -Dm 555 $src $out/bin/.mill-wrapped + # can't use wrapProgram because it sets --argv0 + makeWrapper $out/bin/.mill-wrapped $out/bin/mill \ + --prefix PATH : "${jre}/bin" \ + --set-default JAVA_HOME "${jre}" + + runHook postInstall ''; meta = with lib; { @@ -57,6 +63,12 @@ stdenv.mkDerivation (finalAttrs: { scalavision zenithal ]; - platforms = lib.platforms.all; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/mi/mill/sources.json b/pkgs/by-name/mi/mill/sources.json new file mode 100644 index 000000000000..d90987bf3973 --- /dev/null +++ b/pkgs/by-name/mi/mill/sources.json @@ -0,0 +1,18 @@ +{ + "aarch64-darwin": { + "artifact-suffix": "native-mac-aarch64", + "hash": "sha256-A9dShPyfkfTuRJ1/DkLwb/5NTRTxc7OY7Rd1h0Tzjos=" + }, + "x86_64-darwin": { + "artifact-suffix": "native-mac-amd64", + "hash": "sha256-zctTOVxFghF9z9PUQt3OO20Ul/qY8H/j6MPpFNpw+Ow=" + }, + "aarch64-linux": { + "artifact-suffix": "native-linux-aarch64", + "hash": "sha256-E+IMTkRP1a1TigpRyVHPu0assgHEbzbF8lv7Rsm2FOM=" + }, + "x86_64-linux": { + "artifact-suffix": "native-linux-amd64", + "hash": "sha256-rgAqlTCZc8nedUU2D+Klo3KY0z9sI0KJczdaugM3//8=" + } +} diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index 032229f82a60..d854f28325e1 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -39,6 +39,7 @@ wayland, # magpie wrapper + addDriverRunpath, libGL, vulkan-loader, @@ -128,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + addDriverRunpath blueprint-compiler cargo libxml2 @@ -178,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: { libGL libdrm vulkan-loader + + # NVIDIA support requires linking libnvidia-ml.so at runtime: + # https://github.com/Syllo/nvtop/blob/3.2.0/src/extract_gpuinfo_nvidia.c#L274-L276 + addDriverRunpath.driverLink ] }" ''; diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index 45052a65adaa..036f3865df19 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-gpDwfRKXgp6hEpitflVIAIOU/k3Fx6hKKhyzQvLlog8="; + hash = "sha256-U8DvJPJwShbuKlKsWylH9kUEEw8/SY8KnYWNyInhE9k="; }; postPatch = '' diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 5cc46c2ac552..1c029e710606 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -35,7 +35,6 @@ libXrandr, nix-update-script, onnxruntime, - opencv4, openhmd, openvr, orc, @@ -125,7 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libXext libXrandr onnxruntime - opencv4 + # FIXME: OpenCV support causes a segfault on start. See https://github.com/NixOS/nixpkgs/issues/439075 + # opencv4 openhmd openvr orc diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 20c1ea19c5c7..3190d4f92171 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.30"; + version = "11.38"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-GnC2w1hhQlvpxa254M15xOVsqKUuIjXfgUxwgA7zcxc="; + hash = "sha256-/pZeZFyv04Feocm9KfLfItd/z0i3rK7pPf8Jm9jd2c8="; stripRoot = false; }; diff --git a/pkgs/by-name/mp/mpfshell/package.nix b/pkgs/by-name/mp/mpfshell/package.nix index 41d93206afd8..25f23bddd6bc 100644 --- a/pkgs/by-name/mp/mpfshell/package.nix +++ b/pkgs/by-name/mp/mpfshell/package.nix @@ -5,15 +5,15 @@ }: python3Packages.buildPythonPackage { - pname = "mpfshell-unstable"; - version = "2020-04-11"; + pname = "mpfshell"; + version = "0.9.3-unstable-2025-01-09"; pyproject = true; src = fetchFromGitHub { owner = "wendlers"; repo = "mpfshell"; - rev = "429469fcccbda770fddf7a4277f5db92b1217664"; - sha256 = "0md6ih9vp65dacqy8gki3b2p4v76xb9ijqmxymk4b4f9z684x2m7"; + rev = "d290096ede985e8730b2ed02d130befdb65fde4e"; + hash = "sha256-+AUlBHCzxDKatXrDmmBsf0g4cKZaa9Ui92M0d+49rKo="; }; build-system = with python3Packages; [ setuptools ]; @@ -28,10 +28,10 @@ python3Packages.buildPythonPackage { doCheck = false; pythonImportsCheck = [ "mp.mpfshell" ]; - meta = with lib; { + meta = { homepage = "https://github.com/wendlers/mpfshell"; description = "Simple shell based file explorer for ESP8266 Micropython based devices"; mainProgram = "mpfshell"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index ac228584fac4..928f9d9e0010 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -5,9 +5,10 @@ libsodium, buildGoModule, nix-update-script, + nixosTests, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "museum"; version = "1.2.4"; @@ -15,13 +16,13 @@ buildGoModule rec { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; - tag = "photos-v${version}"; + tag = "photos-v${finalAttrs.version}"; hash = "sha256-2kcIXnQPNB6V8ElTxoAETFCSyIIOGme15pYVXNLPlAg="; }; vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; - sourceRoot = "${src.name}/server"; + sourceRoot = "${finalAttrs.src.name}/server"; nativeBuildInputs = [ pkg-config @@ -42,21 +43,26 @@ buildGoModule rec { $out/share/museum ''; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "photos-v(.*)" - ]; + passthru = { + tests.ente = nixosTests.ente; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "photos-v(.*)" + ]; + }; }; meta = { description = "API server for ente.io"; homepage = "https://github.com/ente-io/ente/tree/main/server"; + changelog = "https://github.com/ente-io/ente/releases/tag/photos-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ pinpox + oddlama ]; mainProgram = "museum"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index 198f5d6a066e..402b8fbf8123 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -189,6 +189,7 @@ stdenv.mkDerivation rec { "mips64-linux" "mips64el-linux" "mipsel-linux" + "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix index d135a5052316..67a99bc8052c 100644 --- a/pkgs/by-name/ne/neohtop/package.nix +++ b/pkgs/by-name/ne/neohtop/package.nix @@ -31,7 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM="; }; - cargoHash = "sha256-nFWF1ER3vk1G/MBw8to+lDJAv6HJNobhdPXV0hVERFE="; + cargoPatches = [ + # Remove when https://github.com/Abdenasser/neohtop/pull/187 is released + ./tauri-version.patch + ]; + cargoHash = "sha256-fl/slVYr5RExI9ab8YeX2Q8mF+cnR1R1rUg5i11ao4M="; cargoRoot = "src-tauri"; @@ -60,6 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "NeoHtop"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sandarukasa ]; }; }) diff --git a/pkgs/by-name/ne/neohtop/tauri-version.patch b/pkgs/by-name/ne/neohtop/tauri-version.patch new file mode 100644 index 000000000000..c2b3a41a53e0 --- /dev/null +++ b/pkgs/by-name/ne/neohtop/tauri-version.patch @@ -0,0 +1,250 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 7e91351..16af8fb 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -379,6 +379,16 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + ++[[package]] ++name = "cookie" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" ++dependencies = [ ++ "time", ++ "version_check", ++] ++ + [[package]] + name = "core-foundation" + version = "0.10.0" +@@ -762,15 +772,6 @@ dependencies = [ + "miniz_oxide", + ] + +-[[package]] +-name = "fluent-uri" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +-dependencies = [ +- "bitflags 1.3.2", +-] +- + [[package]] + name = "fnv" + version = "1.0.7" +@@ -1507,41 +1508,18 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "json-patch" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +-dependencies = [ +- "jsonptr 0.4.7", +- "serde", +- "serde_json", +- "thiserror 1.0.65", +-] +- + [[package]] + name = "json-patch" + version = "3.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" + dependencies = [ +- "jsonptr 0.6.3", ++ "jsonptr", + "serde", + "serde_json", + "thiserror 1.0.65", + ] + +-[[package]] +-name = "jsonptr" +-version = "0.4.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +-dependencies = [ +- "fluent-uri", +- "serde", +- "serde_json", +-] +- + [[package]] + name = "jsonptr" + version = "0.6.3" +@@ -3146,9 +3124,9 @@ dependencies = [ + + [[package]] + name = "tao" +-version = "0.30.5" ++version = "0.30.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63f1f6b2017cc33d7f6fc9c6186a2c0f5dfc985899a7b4fe9e64985c17533db3" ++checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" + dependencies = [ + "bitflags 2.6.0", + "cocoa", +@@ -3202,9 +3180,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + + [[package]] + name = "tauri" +-version = "2.0.6" ++version = "2.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b" ++checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" + dependencies = [ + "anyhow", + "bytes", +@@ -3239,7 +3217,7 @@ dependencies = [ + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "tokio", + "tray-icon", + "url", +@@ -3252,16 +3230,16 @@ dependencies = [ + + [[package]] + name = "tauri-build" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376" ++checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" + dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", +- "json-patch 3.0.1", ++ "json-patch", + "schemars", + "semver", + "serde", +@@ -3274,14 +3252,14 @@ dependencies = [ + + [[package]] + name = "tauri-codegen" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f" ++checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" + dependencies = [ + "base64 0.22.1", + "brotli", + "ico", +- "json-patch 2.0.0", ++ "json-patch", + "plist", + "png", + "proc-macro2", +@@ -3292,7 +3270,7 @@ dependencies = [ + "sha2", + "syn 2.0.87", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "time", + "url", + "uuid", +@@ -3301,9 +3279,9 @@ dependencies = [ + + [[package]] + name = "tauri-macros" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a" ++checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" + dependencies = [ + "heck 0.5.0", + "proc-macro2", +@@ -3371,9 +3349,9 @@ dependencies = [ + + [[package]] + name = "tauri-runtime" +-version = "2.1.1" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784" ++checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" + dependencies = [ + "dpi", + "gtk", +@@ -3383,16 +3361,16 @@ dependencies = [ + "serde", + "serde_json", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "url", + "windows", + ] + + [[package]] + name = "tauri-runtime-wry" +-version = "2.1.2" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30" ++checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" + dependencies = [ + "gtk", + "http", +@@ -3428,7 +3406,7 @@ dependencies = [ + "html5ever", + "http", + "infer", +- "json-patch 3.0.1", ++ "json-patch", + "kuchikiki", + "log", + "memchr", +@@ -4429,12 +4407,13 @@ dependencies = [ + + [[package]] + name = "wry" +-version = "0.46.3" ++version = "0.47.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd5cdf57c66813d97601181349c63b96994b3074fc3d7a31a8cce96e968e3bbd" ++checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73" + dependencies = [ + "base64 0.22.1", + "block2", ++ "cookie", + "crossbeam-channel", + "dpi", + "dunce", +@@ -4459,6 +4438,7 @@ dependencies = [ + "soup3", + "tao-macros", + "thiserror 1.0.65", ++ "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 3af22fb..9bff78d 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -11,7 +11,7 @@ tauri-build = { version = "2", features = [] } + [dependencies] + serde_json = "1.0" + serde = { version = "1.0", features = ["derive"] } +-tauri = { version = "2", features = ["macos-private-api"] } ++tauri = { version = "2.1.1", features = ["macos-private-api"] } + sysinfo = "0.29.0" + tauri-plugin-shell = "2" + tauri-plugin-os = "2" diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 0d87b4816c6f..c118a9ee47f4 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-1jBVBN1/4WVXV6g3L27B+goFHhGcLSHDsPoNnQwt+sU="; + hash = "sha256-wWFIOzoA9FuNI4k0ofagW0ZGgMoGpD0dBozy2wMvcqk="; }; - vendorHash = "sha256-kvcRCRa4KyHFat7fwVw2VJETWIHAYK+/yH1crBZukDU="; + vendorHash = "sha256-ZjeTKj99BTSNFOvtywfmuXfYVxU3s9O2EwD/4IZodvs="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/ni/nix-snapshotter/package.nix b/pkgs/by-name/ni/nix-snapshotter/package.nix index e6bee45d0b3b..a77ec1f168c4 100644 --- a/pkgs/by-name/ni/nix-snapshotter/package.nix +++ b/pkgs/by-name/ni/nix-snapshotter/package.nix @@ -6,13 +6,13 @@ }: let - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pdtpartners"; repo = "nix-snapshotter"; rev = "v${version}"; - hash = "sha256-TCZdXCmnqCPsd3PjLv/LDSKJhTspLliL0DE+c/XP9BY="; + hash = "sha256-sE5/KCQfgMW1Mkgx8FaecY1f6dcjRfE3z4yYsQjhrRc="; }; nix-snapshotter-lib = callPackage "${src}/package.nix" { }; @@ -21,7 +21,7 @@ in buildGoModule { pname = "nix-snapshotter"; inherit version src; - vendorHash = "sha256-QBLePOnfsr6I19ddyZNSFDih6mCaZ/NV2Qz1B1pSHxs="; + vendorHash = "sha256-mWMkDALQ3QvDxgw1Nf0bgWYqeOFDUYKg3UNurNJdD9I="; passthru = { inherit (nix-snapshotter-lib) buildImage; }; meta = { diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index f0c476cc0d11..5d8881a352f9 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oboete"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = finalAttrs.version; - hash = "sha256-I62DQovTa9QWlmA4amnOnp2vomw4/fQuRnj2kY/tdm8="; + hash = "sha256-NRfNabOA09ILbjtvzkSGd3JdDzLRmOeQHQqRDEBHMAA="; }; - cargoHash = "sha256-HV0Q44T9eSEg/MYpFnRCcifsRfZDlvHJ9viCiC1ouUI="; + cargoHash = "sha256-gGVibSf03BewM1nQDDtNFTJdYqiB3LErKmlF0Nf66kQ="; nativeBuildInputs = [ libcosmicAppHook ]; diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix index 65c859754244..b73ac4ffeb7f 100644 --- a/pkgs/by-name/oc/ocm/package.nix +++ b/pkgs/by-name/oc/ocm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "ocm"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-fN7nrWxF4eFaEd5iNpVJWoK23S76jjh20834b/MVlPo="; + sha256 = "sha256-v+BWmdTDJm1oElP/XV59pHm7NlsFj2sDTymtT0xpXKY="; }; - vendorHash = "sha256-q/Se4jq1a25QX9TzVkPbOi7AeT2hossCX4dh9gMqCx0="; + vendorHash = "sha256-GOdRYVnFPS1ovFmU+9MEnwTNg1sa9/25AjzbcbBJrQ0="; # Strip the final binary. ldflags = [ diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 16714558cdf2..b11b57f0ba79 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "8.2.0"; + version = "8.2.1"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-adv"; tag = version; - hash = "sha256-K1MUf9QDDBuIuVovyXYkHPK4eoth4wdFnzjuFpZFBLc="; + hash = "sha256-JMQqh3bNyG1m001D9v8Gt870bioqduDfpaQFwE5INRQ="; }; postPatch = '' diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 360e39e54d72..adf858797a23 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -135,7 +135,6 @@ effectiveStdenv.mkDerivation rec { ]; buildInputs = [ - cpuinfo eigen glibcLocales howard-hinnant-date @@ -145,6 +144,9 @@ effectiveStdenv.mkDerivation rec { pytorch_clog zlib ] + ++ lib.optionals (lib.meta.availableOn effectiveStdenv.hostPlatform cpuinfo) [ + cpuinfo + ] ++ lib.optionals pythonSupport ( with python3Packages; [ @@ -234,11 +236,24 @@ effectiveStdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; }; - # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox - doCheck = !(cudaSupport || effectiveStdenv.buildPlatform.system == "aarch64-linux"); + doCheck = + !( + cudaSupport + || builtins.elem effectiveStdenv.buildPlatform.system [ + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox + "aarch64-linux" + # 1 - onnxruntime_test_all (Failed) + # 4761 tests from 311 test suites ran, 57 failed. + "loongarch64-linux" + ] + ); requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ]; + hardeningEnable = lib.optionals (effectiveStdenv.hostPlatform.system == "loongarch64-linux") [ + "nostrictaliasing" + ]; + postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ @@ -293,7 +308,6 @@ effectiveStdenv.mkDerivation rec { maintainers = with lib.maintainers; [ puffnfresh ck3d - cbourjau ]; }; } diff --git a/pkgs/by-name/op/openfpgaloader/package.nix b/pkgs/by-name/op/openfpgaloader/package.nix index 90dd9140038a..53415b5b8e17 100644 --- a/pkgs/by-name/op/openfpgaloader/package.nix +++ b/pkgs/by-name/op/openfpgaloader/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openfpgaloader"; - version = "0.13.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${finalAttrs.version}"; - hash = "sha256-OC5IeA1gkaclLs0TPbrkaxH/D61SeyDcufkIvEDeuNw="; + hash = "sha256-GPYYvsMSzgZCU4qaANaP3nTa6ooJ7pjJDIzW0H4juQM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 275d14c09151..730efd65593f 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.14.1"; + version = "1.14.2"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Th9+lX2zcCVCdOXA+iXCj1RVstCZCJK5jW6qQw+ugP4="; + hash = "sha256-zn+w/k5Q5/73sOdmWivZKpjoXUjZDXhrCDU9gSYu8Nk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index a703f5c18953..dd3c0893c854 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64 ++ lib.platforms.riscv64 + ++ lib.platforms.power ) lib.platforms.unix; }; }) diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix index 791a78b05b17..2984c4c035d9 100644 --- a/pkgs/by-name/op/openmpi/package.nix +++ b/pkgs/by-name/op/openmpi/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, removeReferencesTo, gfortran, perl, @@ -41,32 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmpi"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-vUGD/LxDR3wlR5m0Kd8abldsBC50otL4s31Tey/5gVc="; + sha256 = "sha256-UxMeGlfnJw9kVwf4sLZbpWBI9bWsP2j6q+0+sNcQ5Ek="; }; - patches = [ - # This patch can be removed with the next openmpi update (>5.0.6) - # See https://github.com/open-mpi/ompi/issues/12784 and https://github.com/open-mpi/ompi/pull/13003 - # Fixes issue where the shared memory backing file cannot be created because directory trees are never created - (fetchpatch { - name = "fix-singletons-session-dir"; - url = "https://github.com/open-mpi/ompi/commit/4d4f7212decd0d0ca719688b15dc9b3ee7553a52.patch"; - hash = "sha256-Mb8qXtAUhAQ90v0SdL24BoTASsKRq2Gu8nYqoeSc9DI="; - }) - # This patch can be removed with the next openmpi update (>5.0.6) - # See https://github.com/open-mpi/ompi/issues/12924 and https://github.com/open-mpi/ompi/pull/12934 - # Fix the size_t/int parameter compile error in coll/cuda - (fetchpatch { - name = "fix-size-t-int-parameter"; - url = "https://github.com/open-mpi/ompi/commit/399f69d68735839d379913a5433ea81dbdbd98bf.patch"; - hash = "sha256-TbB73a419v5JGkiyBAwe/t+6g+pzaR15yAZhdbJIXG4="; - }) - ]; - postPatch = '' patchShebangs ./ @@ -90,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { env = { USER = "nixbld"; HOSTNAME = "localhost"; - SOURCE_DATE_EPOCH = "0"; }; outputs = [ diff --git a/pkgs/by-name/op/openmsx/package.nix b/pkgs/by-name/op/openmsx/package.nix index c396baa4cb7d..627f69585683 100644 --- a/pkgs/by-name/op/openmsx/package.nix +++ b/pkgs/by-name/op/openmsx/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch2, fetchFromGitHub, pkg-config, SDL2, @@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + name = "fix_view_operator.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_view_operator.patch?h=openmsx&id=aa63ce478c7f528d60b79bcf4c9427101caa3b94"; + hash = "sha256-3wmUJQrM5P3zfFJt+HF32AchNSqCgFTnQ508Bztg4uA="; + }) + ]; + nativeBuildInputs = [ pkg-config python3 diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index ea9ed98849cf..fcb3614180df 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + postInstall = '' + substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \ + --replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include" + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 61e223d3da74..ce24dceb1e04 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.816.0"; + version = "2025.912.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip"; - hash = "sha256-5HMjI0+rb7FKwTYsLv2ltFyXL0DQT83/t2i4OpiwwIY="; + hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip"; - hash = "sha256-WqYY3FYHgURk1NKiVcF81GAKBYNPf1M/ZY/3/9XibzI="; + hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage"; - hash = "sha256-mOihQ8mtHEiq0FElkJiZl0mhBqPi8CoGowN358Jc72A="; + hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 12f99637b891..dc23860559ae 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -404,11 +404,6 @@ "version": "2.0.161401", "hash": "sha256-ke9rovup7UFVz2T6HYtHawwrs/XARLDQOwCysC2qDAs=" }, - { - "pname": "Microsoft.DotNet.PlatformAbstractions", - "version": "2.0.3", - "hash": "sha256-qRoDjAl3I8hYH6tQw06UVn5cf55avtTCjRDUzjUJAgg=" - }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.2", @@ -439,11 +434,6 @@ "version": "9.0.2", "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "2.0.3", - "hash": "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY=" - }, { "pname": "Microsoft.Extensions.Features", "version": "9.0.2", @@ -544,11 +534,6 @@ "version": "2.21.0", "hash": "sha256-LZdDJkwQSVBLJfeE3SEckpi+EZcHIccHlhHoUxZ5FqE=" }, - { - "pname": "NativeLibraryLoader", - "version": "1.0.13", - "hash": "sha256-ENubvwbFy0ZB8I88xHTRkkjG8lrQ98jQ33IQoe4rcaM=" - }, { "pname": "NETStandard.Library", "version": "1.6.1", @@ -641,8 +626,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.808.0", - "hash": "sha256-XmetdqG3z66uhdfvY4iEmDAK8Zh2uXPk5Dm25raeYw4=" + "version": "2025.908.0", + "hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -656,8 +641,8 @@ }, { "pname": "ppy.osu.Game.Resources", - "version": "2025.815.0", - "hash": "sha256-DD9yPAmCJrCj/uix6HbRlbQZfyvLyIrKmLP4fZed5fo=" + "version": "2025.911.0", + "hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs=" }, { "pname": "ppy.osuTK.NS20", @@ -671,28 +656,28 @@ }, { "pname": "ppy.SDL3-CS", - "version": "2025.220.0", - "hash": "sha256-A43tJzQ779wQ76wkCxvZ39w3KapZwhUpKe1P4RcOvCQ=" + "version": "2025.828.0", + "hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA=" }, { "pname": "ppy.Veldrid", - "version": "4.9.66-g086790861c", - "hash": "sha256-jnFiRUk+8EV5QMnormygSwm74U949FSqPKYNfMrkI54=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-aFn5I5HofCfUPE9yf/uuKzYZgPEDA+40QxzCV5CPsfM=" }, { "pname": "ppy.Veldrid.MetalBindings", - "version": "4.9.66-g086790861c", - "hash": "sha256-opJ2dRHQP6HPYHw7hM5iWgQeP38RMINv2dJmSF7PptA=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-PLwLXeFCje6Qj7Q1afeIFQJRuRPt2pKnrSqUeMOOtPU=" }, { "pname": "ppy.Veldrid.OpenGLBindings", - "version": "4.9.66-g086790861c", - "hash": "sha256-4zrLJpQVA9BiQP2XeKgW9L/1z3pazDCH46elQ02Un5E=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-l8XNsxVtLrzcq2R8TIjpLu+MNGglxjyk+Pxzo7lzvuY=" }, { "pname": "ppy.Veldrid.SPIRV", - "version": "1.0.15-gb66ebf81d2", - "hash": "sha256-+0dUQTBEU0pPjRhZXvBkWTUpmMFfM9E6FWWT6yHS/9I=" + "version": "1.0.15-g5911265ec3", + "hash": "sha256-XiA2gCiQzjsErPOF4TrbQBhnahFXHIVlsetlEOpPTeI=" }, { "pname": "ppy.Vk", @@ -824,11 +809,6 @@ "version": "4.3.2", "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, - { - "pname": "runtime.native.System", - "version": "4.0.0", - "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" - }, { "pname": "runtime.native.System", "version": "4.3.0", @@ -1034,11 +1014,6 @@ "version": "1.1.0", "hash": "sha256-oP64y/hYgoYo+heDFzmt6sWukTF0lDDFkB16eyoQfHE=" }, - { - "pname": "System.AppContext", - "version": "4.1.0", - "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" - }, { "pname": "System.AppContext", "version": "4.3.0", @@ -1119,11 +1094,6 @@ "version": "4.3.0", "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" - }, { "pname": "System.Dynamic.Runtime", "version": "4.3.0", @@ -1169,11 +1139,6 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", @@ -1429,11 +1394,6 @@ "version": "4.3.0", "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.0.0", - "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" - }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 7a01a58959df..770591ef0b44 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -22,13 +22,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.816.0"; + version = "2025.912.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = "${version}-lazer"; - hash = "sha256-ScCOqo0f8Ms0nai9zCIEkAKWySB7uZiU4lk2itQWLig="; + hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index e9f646dd4c3d..8569087b9db8 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.15"; - code = "XZnIXD5ZeetbMDef3yJKjqE1C5hem0svBpPy"; + version = "1.14.16"; + code = "XZbJvD5ZfXtwygX5xg7F9ywtRup5H5sBvfhy"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-/9JPGA4He1XXy5OhZvfWok3mjnbPZadXK2M8Irf363k="; + hash = "sha256-6K7QPr3MtZvRZt84N8+i8QZBaKHHeTY1bXMdO+wUCr0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix index 32da97a9c703..2ea88f395292 100644 --- a/pkgs/by-name/pe/peru/package.nix +++ b/pkgs/by-name/pe/peru/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "peru"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = python3Packages.pythonOlder "3.5"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { owner = "buildinspace"; repo = "peru"; rev = version; - sha256 = "FCyR14jcFjI6epoFPNVyFZ4k1URZ1NraX1+ajVcCQ2A="; + sha256 = "sha256-ubkDB/McG2Tp3s0K5PbL6QpHbpqRLAUSHa7v+u/n6hI="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/pg/pgpool/package.nix b/pkgs/by-name/pg/pgpool/package.nix index 8f910bf45797..cc6fc803216d 100644 --- a/pkgs/by-name/pg/pgpool/package.nix +++ b/pkgs/by-name/pg/pgpool/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - hash = "sha256-EWye1HXv0CZTKckCcwU6H6ahjuaNXFTtRnl80OAB9kg="; + hash = "sha256-RmiGaLKs5n2BYaMgJWJS2YaYvH2XiMxnJyadVyApnyw="; }; buildInputs = [ diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index d804ecd31740..cbef97e3c891 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; tag = "v${finalAttrs.version}"; - hash = "sha256-uJnxCReo/GR/zAwQEV1Gp9Hv6ydGbf4EiVNL7q0cRRw="; + hash = "sha256-4s3PCgaJfJR9+XXqT2WLrEwNUSLLCIOb+nJ8w9SbKps="; }; - vendorHash = "sha256-/7A71XQdMfirqfN9VIKFZxJ1HNBva5c2NOsbo6NMRzQ="; + vendorHash = "sha256-4/J3TJPdbj+eAneMwxP73N1cI53hJSEQg4G+LlQOJeE="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix index 1262683c29c4..e3f257a10b90 100644 --- a/pkgs/by-name/ph/photocollage/package.nix +++ b/pkgs/by-name/ph/photocollage/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "photocollage"; - version = "1.4.6"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "adrienverge"; repo = "PhotoCollage"; rev = "v${version}"; - hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg="; + hash = "sha256-YEkQ5yVFCBBFg8IL5ExvZIi0moaG/c0LtsIkphuzuog="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/pl/plasma-hud/package.nix b/pkgs/by-name/pl/plasma-hud/package.nix index 078bda093c5b..e858264e9b94 100644 --- a/pkgs/by-name/pl/plasma-hud/package.nix +++ b/pkgs/by-name/pl/plasma-hud/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "plasma-hud"; - version = "19.10.1"; + version = "22.01.0"; format = "other"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-hud"; rev = version; - hash = "sha256-1AQtgVlrmzBkim1kVZzTAwJHq0OH3YAPr6o5aUpgdKc="; + hash = "sha256-HEAvwQSROQtJAZdiDObu9qbpgJlkJdks2v95Xjh5520="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index f9e4417297fd..f3be5276cbed 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "25.2.4"; + version = "25.2.8"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-XBjKVAwdCJdfhKw8LigBEUp3UiAF/wgvcSlc+vh00P0="; + hash = "sha256-jJzERpVCAQtTxuC2J7F9SHq9NuyihLzQjLzIcSfXziE="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix index 866d684e8439..c5647b834b25 100644 --- a/pkgs/by-name/pm/pmix/package.nix +++ b/pkgs/by-name/pm/pmix/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pmix"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; tag = "v${finalAttrs.version}"; - hash = "sha256-qj/exBi1siCHY1QqNY+ad6n3XI4JZuwnM93Vp+rj1AQ="; + hash = "sha256-oYqDFXycNCYv0YK4VbkW5SQWLq+FTJEyY9rvH50nbYI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index f1bc004dba45..3e1aaee4f350 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "podman-tui"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-WNaHpr5Ujq2xiA0LJV7KHRT3qGHojYex4LZhiFTGusk="; + hash = "sha256-lTgILCaisnCXMnNL6DSGIszJBC3GiPStZzol3dCm/7s="; }; vendorHash = null; diff --git a/pkgs/by-name/po/postfixadmin/package.nix b/pkgs/by-name/po/postfixadmin/package.nix index aee39b5d9a52..eeb9928e2b7a 100644 --- a/pkgs/by-name/po/postfixadmin/package.nix +++ b/pkgs/by-name/po/postfixadmin/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "postfixadmin"; - version = "3.3.15"; + version = "3.3.16"; src = fetchFromGitHub { owner = "postfixadmin"; repo = "postfixadmin"; tag = "postfixadmin-${version}"; - hash = "sha256-dKdJS9WQ/pPYITP53/Aynls8ZgVF7tAqL9gQEw+u8TM="; + hash = "sha256-sSn5XHxnpP2Axv9BD9IvzSmu8MthcylEPk1kU51p/3k="; }; installPhase = '' diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 48b697e5c9e9..0a364dbd5554 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule rec { pname = "process-compose"; - version = "1.73.0"; + version = "1.75.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = "process-compose"; tag = "v${version}"; - hash = "sha256-oqScez+Ms01/TyGo3HmhtEgofIbpLqQtEyQH6kxVGrw="; + hash = "sha256-4Frcslk0QBRl3OuWt4+erXoZhIUut8G0op91+1U1bfI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -45,7 +45,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-fV0yuANSZyJlPGZ/nt5q9Bz6ps5bKM8gtLmNmfPMMoU="; + vendorHash = "sha256-AXmULIWtEsNhSZ764BH5AkXlh49HNKT1jZABzhPIzPQ="; doCheck = false; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index dcd7ebfd3c48..2e3d7faf7bd6 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.32.5"; + version = "1.32.6"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-nf24oCLeJ0FoWPCB1NKFEDfzLkRWvvgzMFItFw4dikY="; + hash = "sha256-xtptEi/H15fEABrlPE854uSWagr2kt2/h33SuegVab8="; }; dontConfigure = true; diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 81d02236c7fb..f32feb73131e 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.255.0"; + version = "0.256.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-0caCv8wy4MQ/u9+LKLQEm5agH6UnGnHrJlLAHi4kjKY="; + sha256 = "sha256-NyagnglUYl46ifjzTIOwTp0F9FiUCX92kRBem6PMehs="; }; - vendorHash = "sha256-4xpDVXT8t0UvYh7k0RGgHz4idphgmnjTn1q/aLmLkHU="; + vendorHash = "sha256-OXTbZUz2pC42N35rxCQH7jf3GZpNHSwWvCktwTsfiOU="; ldflags = [ "-s" diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix index ea52b105a179..3b7cd8afd4fd 100644 --- a/pkgs/by-name/py/pychess/package.nix +++ b/pkgs/by-name/py/pychess/package.nix @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { sqlalchemy pexpect psutil + standard-telnetlib websockets ptyprocess ]; diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index 4669d0926df4..a35ced9b5764 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.10.4"; + version = "1.11.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-iSsQKVfcH5AjX+bURYK7UPdZKWFX6WaFSrpeRC5IE/0="; + hash = "sha256-OR/rBp84pXv286Vd0I6IRzeUdC/+nnlRCZMAMXKgyxo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/radiance/package.nix b/pkgs/by-name/ra/radiance/package.nix index 7cc51249f979..3d67eac17466 100644 --- a/pkgs/by-name/ra/radiance/package.nix +++ b/pkgs/by-name/ra/radiance/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Validated Lighting Simulation Tool"; homepage = "https://github.com/LBNL-ETA/Radiance"; - license = lib.licenses.radiance; + license = lib.licenses.bsd3Lbnl; maintainers = with lib.maintainers; [ robwalt ]; mainProgram = "rad"; }; diff --git a/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch b/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch deleted file mode 100644 index ddfec9b22e14..000000000000 --- a/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c -index 638c39c..c8758d2 100644 ---- a/test/unit/test_uv_fs.c -+++ b/test/unit/test_uv_fs.c -@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) - return MUNIT_OK; - } - --/* If the directory doesn't exist, it an error is returned. */ --TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) --{ -- const char *parent = data; -- char errmsg[RAFT_ERRMSG_BUF_SIZE]; -- char dir[128]; -- sprintf(errmsg, "%s/sub", parent); -- sprintf(errmsg, "directory '%s' does not exist", dir); -- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); -- return MUNIT_OK; --} -- - /* If the process can't access the directory, an error is returned. */ - TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) - { diff --git a/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch b/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch deleted file mode 100644 index 7c8be29feafd..000000000000 --- a/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2137932..93abdb6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ - test/integration/test_uv_bootstrap.c \ - test/integration/test_uv_load.c \ - test/integration/test_uv_recover.c \ -- test/integration/test_uv_recv.c \ -- test/integration/test_uv_send.c \ - test/integration/test_uv_set_term.c \ -- test/integration/test_uv_tcp_connect.c \ -- test/integration/test_uv_tcp_listen.c \ - test/integration/test_uv_snapshot_put.c \ - test/integration/test_uv_truncate.c \ - test/integration/test_uv_work.c diff --git a/pkgs/by-name/ra/raft-canonical/package.nix b/pkgs/by-name/ra/raft-canonical/package.nix deleted file mode 100644 index 86c4156fafd5..000000000000 --- a/pkgs/by-name/ra/raft-canonical/package.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - file, - libuv, - lz4, - lxd-lts, -}: - -stdenv.mkDerivation rec { - pname = "raft-canonical"; - version = "0.18.1"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "raft"; - tag = "v${version}"; - hash = "sha256-ogTw0+ZFhMRaLAxAAXzHSlLRYFuX8W/zjqglXHfvUv4="; - }; - - nativeBuildInputs = [ - autoreconfHook - file - pkg-config - ]; - buildInputs = [ - libuv - lz4 - ]; - - enableParallelBuilding = true; - - patches = [ - # network tests either hang indefinitely, or fail outright - ./disable-net-tests.patch - - # missing dir check is flaky - ./disable-missing-dir-test.patch - ]; - - preConfigure = '' - substituteInPlace configure --replace /usr/bin/ " " - ''; - - doCheck = true; - - outputs = [ - "dev" - "out" - ]; - - passthru.tests = { - inherit lxd-lts; - }; - - meta = with lib; { - description = '' - Fully asynchronous C implementation of the Raft consensus protocol - ''; - longDescription = '' - The library has modular design: its core part implements only the core - Raft algorithm logic, in a fully platform independent way. On top of - that, a pluggable interface defines the I/O implementation for networking - (send/receive RPC messages) and disk persistence (store log entries and - snapshots). - ''; - homepage = "https://github.com/canonical/raft"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/ra/rambox/package.nix b/pkgs/by-name/ra/rambox/package.nix index ad5a3067004a..ded18f314e29 100644 --- a/pkgs/by-name/ra/rambox/package.nix +++ b/pkgs/by-name/ra/rambox/package.nix @@ -7,11 +7,11 @@ let pname = "rambox"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-x2GzWKVRz/Uqyq4iu16F/esF+L4F0sETxZsvNIEwPVU="; + hash = "sha256-jtROOwqht/3j5h9SZx0UmGj5iKrQeSsXe7XvQnPhxuM="; }; desktopItem = ( diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 769381bf6270..ade8e723421b 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.102.5"; + version = "1.102.7"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-Fh46CsAeE9TpqVlYCc6s5ytO5dm+xoDJ7NawML4D9R4="; + hash = "sha256-nfkgwSmIIRtsU6j+/y9xWO7KaBDQCrphftyn58/Pqrk="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-tBFnk5R9BqfL+MH1tBY76al7/jVzqpfI7yIGADQh6wQ="; + hash = "sha256-4H8TlPEkp5m+E+Eo3VvNE9F5g7v3h4F6inf7UysTW0U="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 23326ab144a4..5e048735e36e 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "re-Isearch"; - version = "2.20220925.4.0a-unstable-2025-05-15"; + version = "2.20220925.4.0a-unstable-2025-09-11"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "35e939fd60948f112b668b06d2b8b75f2c7425d3"; - hash = "sha256-r7KUwx2SrfnpSknGSpzw33Qwp63htoKknrnmdOgA/9Y="; + rev = "26e44f3d66e7f19def909a8179f798f6a4fe0a8a"; + hash = "sha256-zAYdZrKx2xaNrPYS0BbNNA30TkMqqR8P7pCB/j9VBuY="; }; patches = [ diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index 04fc805c0649..3184c8b77206 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebuilderd"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = "rebuilderd"; tag = "v${finalAttrs.version}"; - hash = "sha256-6LBTUb6kCR/oSyIhiVADSz+oE2xLSY5GKxUQ4HcDFJk="; + hash = "sha256-BuL9s3ewZ1NvR9GG51TVrAncB0PR78Wuw8by+loSP8Q="; }; postPatch = '' @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/bin/echo' 'echo' ''; - cargoHash = "sha256-s6gXinH706tAxDyHrhPV4u+Z1tbLvBOhI1JhdiwrHG8="; + cargoHash = "sha256-4M5uWgksYsV8PGe0zn9ADv06q3Ga/GVoQ8HjS7GCnwo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rk/rkik/package.nix b/pkgs/by-name/rk/rkik/package.nix index 49caaa95ef36..51fa618e2a6a 100644 --- a/pkgs/by-name/rk/rkik/package.nix +++ b/pkgs/by-name/rk/rkik/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rkik"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "aguacero7"; repo = "rkik"; tag = "v${finalAttrs.version}"; - hash = "sha256-MVNqc0IHFZTi3Vz1OeKeRrKbk4kcM3GvfTPajs+FHew="; + hash = "sha256-1mjhr2e7+AlwF65eCdFadpiX/Zbkb5vLYxw8CMmxkJk="; }; - cargoHash = "sha256-CuFQFHN9O/bnZ32sQoj4aduLECpKmBXfJt5n0IH/5Tc="; + cargoHash = "sha256-G/U+PomAOf4n6WOU/WuimXLzQISoX/80PaL+H4r4SFI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 84a77c85648f..756c7cdfa1c5 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-3smmsco9xgOv+xCo9QIAudbHjZ1s3sKLEQmLXXaylYQ="; + hash = "sha256-wRLdxnAD9wZeIwWiX+x/j2gaVv1/iEsy3jYIeb3hWoo="; }; vendorHash = null; diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index 29e3c30ac9eb..20c4356c163c 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "roxterm"; - version = "3.16.6"; + version = "3.17.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = finalAttrs.version; - hash = "sha256-T6xFExsgYGUVLgDS7sx5juoraMjzIYyfsXHvQUAm1fc="; + hash = "sha256-daUfjiRk/Ie7eoAZnQlXCO//V1XZ0WOX7/kA32qqAzA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch b/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch new file mode 100644 index 000000000000..c0026c7881c3 --- /dev/null +++ b/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch @@ -0,0 +1,250 @@ +From 6625fded5d55b89ce77e0dd5f1bd153428c3bdd2 Mon Sep 17 00:00:00 2001 +From: Brand Huntsman +Date: Mon, 5 May 2025 02:35:02 -0600 +Subject: [PATCH] Fix tests when using html2text 2025.4.15. + +https://github.com/Alir3z4/html2text/pull/431 changed the 'pre' tag +indentation spacing. + +Fixes #278. + +Reported-By: Luis Henriques +--- + test/data/tails/1.expected | 94 +++++++++++++++++++------------------- + test/data/tails/2.expected | 92 ++++++++++++++++++------------------- + 2 files changed, 93 insertions(+), 93 deletions(-) + +diff --git a/test/data/tails/1.expected b/test/data/tails/1.expected +index cd6238c..0feef24 100644 +--- a/test/data/tails/1.expected ++++ b/test/data/tails/1.expected +@@ -362,48 +362,48 @@ YzEuCgpUbyBkbyBhbiBhdXRvbWF0aWMgdXBncmFkZSB0byBUYWlscyA0LjExfnJjMToKCiAgICAx + LiBTdGFydCBUYWlscyA0LjIgb3IgbGF0ZXIgYW5kIFtzZXQgYW4gYWRtaW5pc3RyYXRpb24gcGFz + c3dvcmRdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL2ZpcnN0X3N0ZXBzL3dlbGNvbWVfc2Ny + ZWVuL2FkbWluaXN0cmF0aW9uX3Bhc3N3b3JkL2luZGV4LmVuLmh0bWwpLgoKICAgIDIuIFJ1biB0 +-aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAKICAgICAgICAgICAgICAgIGVj +-aG8gVEFJTFNfQ0hBTk5FTD1cImFscGhhXCIgfCBzdWRvIHRlZSAtYSAvZXRjL29zLXJlbGVhc2Ug +-JiYgXAogICAgICAgICAgICAgdGFpbHMtdXBncmFkZS1mcm9udGVuZC13cmFwcGVyCiAgICAgICAg +-CgpFbnRlciB0aGUgYWRtaW5pc3RyYXRpb24gcGFzc3dvcmQgd2hlbiBhc2tlZCBmb3IgdGhlICJw +-YXNzd29yZCBmb3IgYW1uZXNpYSIuCgogICAgMy4gQWZ0ZXIgdGhlIHVwZ3JhZGUgaXMgYXBwbGll +-ZCwgcmVzdGFydCBUYWlscyBhbmQgY2hvb3NlICoqQXBwbGljYXRpb25zICDilrggVGFpbHMg4pa4 +-IEFib3V0IFRhaWxzKiogdG8gdmVyaWZ5IHRoYXQgeW91IGFyZSBydW5uaW5nIFRhaWxzIDQuMTF+ +-cmMxLgoKICAqIElmIHlvdSBjYW5ub3QgZG8gYW4gYXV0b21hdGljIHVwZ3JhZGUgb3IgaWYgVGFp +-bHMgZmFpbHMgdG8gc3RhcnQgYWZ0ZXIgYW4gYXV0b21hdGljIHVwZ3JhZGUsIHBsZWFzZSB0cnkg +-dG8gZG8gYSBbbWFudWFsIHVwZ3JhZGVdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL3VwZ3Jh +-ZGUvaW5kZXguZW4uaHRtbCNtYW51YWwpLgoKIyMgVG8gZG93bmxvYWQgNC4xMX5yYzEKCiMjIyBE +-aXJlY3QgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0dHA6Ly9k +-bC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxzLWFtZDY0LTQuMTF+cmMxL3RhaWxz +-LWFtZDY0LTQuMTF+cmMxLmltZykgKFs/XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lraXdpa2ku +-Y2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEtcmMxJnBhZ2U9dG9ycmVudHMlMkZm +-aWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmltZy5zaWcpT3BlblBHUCBzaWduYXR1cmUpCgog +-ICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1hZ2UpXShodHRwOi8vZGwu +-YW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90YWlscy1h +-bWQ2NC00LjExfnJjMS5pc28pIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3aWtpLmNn +-aT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRzJTJGZmls +-ZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pc28uc2lnKU9wZW5QR1Agc2lnbmF0dXJlKQoKIyMj +-IEJpdFRvcnJlbnQgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVudHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEu +-aW1nLnRvcnJlbnQpCgogICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1h +-Z2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQu +-MTF+cmMxLmlzby50b3JyZW50KQoKIyMgVG8gaW5zdGFsbCBUYWlscyBvbiBhIG5ldyBVU0Igc3Rp +-Y2sKCkZvbGxvdyBvdXIgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9uczoKCiAgKiBbSW5zdGFsbCBm +-cm9tIFdpbmRvd3NdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC93aW4vdXNiL2luZGV4 +-LmVuLmh0bWwpCiAgKiBbSW5zdGFsbCBmcm9tIG1hY09TXShodHRwczovL3RhaWxzLmJvdW0ub3Jn +-L2luc3RhbGwvbWFjL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBMaW51eF0o +-aHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL2xpbnV4L3VzYi9pbmRleC5lbi5odG1sKQoK +-QWxsIHRoZSBkYXRhIG9uIHRoaXMgVVNCIHN0aWNrIHdpbGwgYmUgbG9zdC4KCiMgV2hhdCdzIGNv +-bWluZyB1cD8KClRhaWxzIDQuMTEgaXMgW3NjaGVkdWxlZF0oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9jb250cmlidXRlL2NhbGVuZGFyLykgZm9yClNlcHRlbWJlciAyMi4KCkhhdmUgYSBsb29rIGF0 +-IG91ciBbcm9hZG1hcF0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL3JvYWRtYXAp +-IHRvIHNlZQp3aGVyZSB3ZSBhcmUgaGVhZGluZyB0by4KCldlIG5lZWQgeW91ciBoZWxwIGFuZCB0 +-aGVyZSBhcmUgbWFueSB3YXlzIHRvIFtjb250cmlidXRlIHRvClRhaWxzXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2NvbnRyaWJ1dGUvaW5kZXguZW4uaHRtbCkKKFtkb25hdGluZ10oaHR0cHM6Ly90 +-YWlscy5ib3VtLm9yZy9kb25hdGUvP3I9NC4xMS1yYzEpIGlzIG9ubHkgb25lIG9mIHRoZW0pLgpD +-b21lIFt0YWxrIHRvIHVzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2Fib3V0L2NvbnRhY3QvaW5k +-ZXguZW4uaHRtbCN0YWlscy0KZGV2KSEKCgoKVVJMOiBodHRwczovL3RhaWxzLmJvdW0ub3JnL25l +-d3MvdGVzdF80LjExLXJjMS8= ++aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAgICAKICAgICAgICAgICBlY2hv ++IFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUgLWEgL2V0Yy9vcy1yZWxlYXNlICYm ++IFwKICAgICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRlbmQtd3JhcHBlcgogICAgICAg ++ICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdoZW4gYXNrZWQgZm9yIHRo ++ZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRoZSB1cGdyYWRlIGlzIGFw ++cGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0aW9ucyAg4pa4IFRhaWxz ++IOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUgcnVubmluZyBUYWlscyA0 ++LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRpYyB1cGdyYWRlIG9yIGlm ++IFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1cGdyYWRlLCBwbGVhc2Ug ++dHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy91 ++cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25sb2FkIDQuMTF+cmMxCgoj ++IyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2UpXShodHRw ++Oi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90 ++YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3 ++aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRz ++JTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9wZW5QR1Agc2lnbmF0dXJl ++KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cDov ++L2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1kNjQtNC4xMX5yYzEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaWtpd2lr ++aS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEmcGFnZT10b3JyZW50cyUy ++RmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVuUEdQIHNpZ25hdHVyZSkK ++CiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2Up ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQuMTF+ ++cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP ++IGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxlcy90YWlscy1hbWQ2 ++NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFpbHMgb24gYSBuZXcgVVNC ++IHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlvbnM6CgogICogW0luc3Rh ++bGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvd2luL3VzYi9p ++bmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0cHM6Ly90YWlscy5ib3Vt ++Lm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gTGlu ++dXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91c2IvaW5kZXguZW4uaHRt ++bCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJlIGxvc3QuCgojIFdoYXQn ++cyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIgMjIuCgpIYXZlIGEgbG9v ++ayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9yb2Fk ++bWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBuZWVkIHlvdXIgaGVscCBh ++bmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpUYWlsc10oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihbZG9uYXRpbmddKGh0dHBz ++Oi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBvbmx5IG9uZSBvZiB0aGVt ++KS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9hYm91dC9jb250YWN0 ++L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgoKClVSTDogaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9uZXdzL3Rlc3RfNC4xMS1yYzEv + + + SENT BY: "Tails - News: " +@@ -796,17 +796,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). +diff --git a/test/data/tails/2.expected b/test/data/tails/2.expected +index 7b48a67..7e9fd49 100644 +--- a/test/data/tails/2.expected ++++ b/test/data/tails/2.expected +@@ -933,47 +933,47 @@ bHMgNC4xMX5yYzE6CgogICAgMS4gU3RhcnQgVGFpbHMgNC4yIG9yIGxhdGVyIGFuZCBbc2V0IGFu + IGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy9maXJz + dF9zdGVwcy93ZWxjb21lX3NjcmVlbi9hZG1pbmlzdHJhdGlvbl9wYXNzd29yZC9pbmRleC5lbi5o + dG1sKS4KCiAgICAyLiBSdW4gdGhpcyBjb21tYW5kIGluIGEgX1Rlcm1pbmFsXyA6CiAgICAgICAg +-CiAgICAgICAgICAgICAgICBlY2hvIFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUg +-LWEgL2V0Yy9vcy1yZWxlYXNlICYmIFwKICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRl +-bmQtd3JhcHBlcgogICAgICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdo +-ZW4gYXNrZWQgZm9yIHRoZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRo +-ZSB1cGdyYWRlIGlzIGFwcGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0 +-aW9ucyAg4pa4IFRhaWxzIOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUg +-cnVubmluZyBUYWlscyA0LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRp +-YyB1cGdyYWRlIG9yIGlmIFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1 +-cGdyYWRlLCBwbGVhc2UgdHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2RvYy91cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25s +-b2FkIDQuMTF+cmMxCgojIyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChV +-U0IgaW1hZ2UpXShodHRwOi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1h +-bWQ2NC00LjExfnJjMS90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWls +-cy5ib3VtLm9yZy9pa2l3aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJj +-MSZwYWdlPXRvcnJlbnRzJTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9w +-ZW5QR1Agc2lnbmF0dXJlKQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP +-IGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1k +-NjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMu +-Ym91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEm +-cGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVu +-UEdQIHNpZ25hdHVyZSkKCiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3Rp +-Y2tzIChVU0IgaW1hZ2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3Rh +-aWxzLWFtZDY0LTQuMTF+cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVh +-bCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9m +-aWxlcy90YWlscy1hbWQ2NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFp +-bHMgb24gYSBuZXcgVVNCIHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlv +-bnM6CgogICogW0luc3RhbGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lu +-c3RhbGwvd2luL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0 +-cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJ +-bnN0YWxsIGZyb20gTGludXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91 +-c2IvaW5kZXguZW4uaHRtbCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJl +-IGxvc3QuCgojIFdoYXQncyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIg +-MjIuCgpIYXZlIGEgbG9vayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcv +-Y29udHJpYnV0ZS9yb2FkbWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBu +-ZWVkIHlvdXIgaGVscCBhbmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpU +-YWlsc10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihb +-ZG9uYXRpbmddKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBv +-bmx5IG9uZSBvZiB0aGVtKS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9hYm91dC9jb250YWN0L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgpVUkw6IDxodHRwczov +-L3RhaWxzLmJvdW0ub3JnL25ld3MvdGVzdF80LjExLXJjMS8+Cgo= ++ICAgCiAgICAgICAgICAgZWNobyBUQUlMU19DSEFOTkVMPVwiYWxwaGFcIiB8IHN1ZG8gdGVlIC1h ++IC9ldGMvb3MtcmVsZWFzZSAmJiBcCiAgICAgICAgICAgICAgICB0YWlscy11cGdyYWRlLWZyb250 ++ZW5kLXdyYXBwZXIKICAgICAgICAgICAKCkVudGVyIHRoZSBhZG1pbmlzdHJhdGlvbiBwYXNzd29y ++ZCB3aGVuIGFza2VkIGZvciB0aGUgInBhc3N3b3JkIGZvciBhbW5lc2lhIi4KCiAgICAzLiBBZnRl ++ciB0aGUgdXBncmFkZSBpcyBhcHBsaWVkLCByZXN0YXJ0IFRhaWxzIGFuZCBjaG9vc2UgKipBcHBs ++aWNhdGlvbnMgIOKWuCBUYWlscyDilrggQWJvdXQgVGFpbHMqKiB0byB2ZXJpZnkgdGhhdCB5b3Ug ++YXJlIHJ1bm5pbmcgVGFpbHMgNC4xMX5yYzEuCgogICogSWYgeW91IGNhbm5vdCBkbyBhbiBhdXRv ++bWF0aWMgdXBncmFkZSBvciBpZiBUYWlscyBmYWlscyB0byBzdGFydCBhZnRlciBhbiBhdXRvbWF0 ++aWMgdXBncmFkZSwgcGxlYXNlIHRyeSB0byBkbyBhIFttYW51YWwgdXBncmFkZV0oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9kb2MvdXBncmFkZS9pbmRleC5lbi5odG1sI21hbnVhbCkuCgojIyBUbyBk ++b3dubG9hZCA0LjExfnJjMQoKIyMjIERpcmVjdCBkb3dubG9hZAoKICAqIFtGb3IgVVNCIHN0aWNr ++cyAoVVNCIGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nKSAoWz9dKGh0dHBzOi8v ++dGFpbHMuYm91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4x ++MS1yYzEmcGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nLnNp ++ZylPcGVuUEdQIHNpZ25hdHVyZSkKCiAgKiBbRm9yIERWRHMgYW5kIHZpcnR1YWwgbWFjaGluZXMg ++KElTTyBpbWFnZSldKGh0dHA6Ly9kbC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxz ++LWFtZDY0LTQuMTF+cmMxL3RhaWxzLWFtZDY0LTQuMTF+cmMxLmlzbykgKFs/XShodHRwczovL3Rh ++aWxzLmJvdW0ub3JnL2lraXdpa2kuY2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEt ++cmMxJnBhZ2U9dG9ycmVudHMlMkZmaWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmlzby5zaWcp ++T3BlblBHUCBzaWduYXR1cmUpCgojIyMgQml0VG9ycmVudCBkb3dubG9hZAoKICAqIFtGb3IgVVNC ++IHN0aWNrcyAoVVNCIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxl ++cy90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcudG9ycmVudCkKCiAgKiBbRm9yIERWRHMgYW5kIHZp ++cnR1YWwgbWFjaGluZXMgKElTTyBpbWFnZSldKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVu ++dHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnRvcnJlbnQpCgojIyBUbyBpbnN0YWxs ++IFRhaWxzIG9uIGEgbmV3IFVTQiBzdGljawoKRm9sbG93IG91ciBpbnN0YWxsYXRpb24gaW5zdHJ1 ++Y3Rpb25zOgoKICAqIFtJbnN0YWxsIGZyb20gV2luZG93c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9pbnN0YWxsL3dpbi91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gbWFjT1Nd ++KGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9tYWMvdXNiL2luZGV4LmVuLmh0bWwpCiAg ++KiBbSW5zdGFsbCBmcm9tIExpbnV4XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvbGlu ++dXgvdXNiL2luZGV4LmVuLmh0bWwpCgpBbGwgdGhlIGRhdGEgb24gdGhpcyBVU0Igc3RpY2sgd2ls ++bCBiZSBsb3N0LgoKIyBXaGF0J3MgY29taW5nIHVwPwoKVGFpbHMgNC4xMSBpcyBbc2NoZWR1bGVk ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2NvbnRyaWJ1dGUvY2FsZW5kYXIvKSBmb3IKU2VwdGVt ++YmVyIDIyLgoKSGF2ZSBhIGxvb2sgYXQgb3VyIFtyb2FkbWFwXShodHRwczovL3RhaWxzLmJvdW0u ++b3JnL2NvbnRyaWJ1dGUvcm9hZG1hcCkgdG8gc2VlCndoZXJlIHdlIGFyZSBoZWFkaW5nIHRvLgoK ++V2UgbmVlZCB5b3VyIGhlbHAgYW5kIHRoZXJlIGFyZSBtYW55IHdheXMgdG8gW2NvbnRyaWJ1dGUg ++dG8KVGFpbHNdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9pbmRleC5lbi5odG1s ++KQooW2RvbmF0aW5nXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvbmF0ZS8/cj00LjExLXJjMSkg ++aXMgb25seSBvbmUgb2YgdGhlbSkuCkNvbWUgW3RhbGsgdG8gdXNdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvYWJvdXQvY29udGFjdC9pbmRleC5lbi5odG1sI3RhaWxzLQpkZXYpIQoKVVJMOiA8aHR0 ++cHM6Ly90YWlscy5ib3VtLm9yZy9uZXdzL3Rlc3RfNC4xMS1yYzEvPgoK + + --===============...==-- + +@@ -1951,17 +1951,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). diff --git a/pkgs/by-name/rs/rss2email/package.nix b/pkgs/by-name/rs/rss2email/package.nix index 143a3a9edc56..3ad52d6d5d7d 100644 --- a/pkgs/by-name/rs/rss2email/package.nix +++ b/pkgs/by-name/rs/rss2email/package.nix @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/rss2email/rss2email/commit/b5c0e78006c2db6929b5ff50e8529de58a00412a.patch"; hash = "sha256-edmsi3I0acx5iF9xoAS9deSexqW2UtWZR/L7CgeZs/M="; }) + # https://github.com/rss2email/rss2email/pull/279 + ./html2text-2025.4.15-compat.patch (fetchpatch2 { name = "use-poetry-core.patch"; url = "https://github.com/rss2email/rss2email/commit/183a17aefe4eb66f898cf088519b1e845559f2bd.patch"; diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 0d72da67a5de..9514d0a2a102 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.32"; + version = "1.0.33"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-XgWtuNtBqizk9HHiVyQRuUeCBrra2Hq9jnlvZdPjNTQ="; + hash = "sha256-aIZWTrG1NimE6cPzs1drrTfvbHAuObUOjlPgZv3PaSg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix index 6d1faea9c37a..da3957eada9d 100644 --- a/pkgs/by-name/sb/sbt-extras/package.nix +++ b/pkgs/by-name/sb/sbt-extras/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "d7d876d6868ae1d262a7de38cbffbb8521c4233c"; - version = "2025-07-06"; + rev = "103ab5905df0d7be505e258fc600935bbb511ec9"; + version = "2025-08-25"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "zAkuXAjF9JAyvOj5Qk/TYR++9OMrmRA3dxpY086zG48="; + sha256 = "UlxZsCi4EdcHvGwatQm1sPyamfcqJs9o8qo2HWLedQw="; }; dontBuild = true; diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix index 66c7e032576e..16c3bfe5ef42 100644 --- a/pkgs/by-name/se/seafile-shared/package.nix +++ b/pkgs/by-name/se/seafile-shared/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.14"; + version = "9.0.15"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - hash = "sha256-1vQ2iGwdzd4c69LYAJjSsUPt8AVL3kOPw0GsxgeN+bU="; + hash = "sha256-mWIOk8O3vlg7Sm/5ZQUB5nOgi8/pEczCGQ94p0km/GI="; }; postPatch = '' diff --git a/pkgs/by-name/se/server-box/gitHashes.json b/pkgs/by-name/se/server-box/gitHashes.json index 5fceb20789d7..8da0bdd3549c 100644 --- a/pkgs/by-name/se/server-box/gitHashes.json +++ b/pkgs/by-name/se/server-box/gitHashes.json @@ -2,10 +2,10 @@ "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=", "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", "dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=", - "fl_build": "sha256-hCojuXFuN33/prCyuPcMoehWiGfaR2yOJA2V6dOuz4E=", + "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=", "fl_lib": "sha256-kg52OMCznepmqUl8PpikabeDyRoRwDbyo997PDcTxJA=", "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=", "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=", "watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=", - "xterm": "sha256-j1+cN6r0qcmOk7YneRVM5SzimqiTUcG/a+cTsCqsq9k=" + "xterm": "sha256-VxAWV40R+rSvYyS9LZoD7GL1K1gwjMnpoKd7hfb48Wo=" } diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 66fc3c200d1d..a57a4b8300f5 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -12,13 +12,13 @@ }: let - version = "1.0.1241"; + version = "1.0.1253"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-qiMCOd6U66VNo5NRUwOh0Pvb84g2v9V/DIWAy7/bCuk="; + hash = "sha256-UflskghSx9ODQ8q2TI9DRjfmWSxp5wSDYGomUcv/Oy4="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json index c5fef2751232..0d701f98082b 100644 --- a/pkgs/by-name/se/server-box/pubspec.lock.json +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -597,8 +597,8 @@ "dependency": "direct dev", "description": { "path": ".", - "ref": "v1.0.51", - "resolved-ref": "430672b7c7608b68ceda785533ec11e1ac3e9ca7", + "ref": "v1.0.52", + "resolved-ref": "38e7d41ccd71bf44e286d86b4ad656f05c5c2548", "url": "https://github.com/lppcg/fl_build.git" }, "source": "git", @@ -2292,8 +2292,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v4.0.3", - "resolved-ref": "c64183346b924173eb7251800001a64771911185", + "ref": "v4.0.4", + "resolved-ref": "5747837cdb7b113ef733ce0104e4f2bfa1eb4a36", "url": "https://github.com/lollipopkit/xterm.dart" }, "source": "git", diff --git a/pkgs/by-name/se/setools/package.nix b/pkgs/by-name/se/setools/package.nix index 8fc3472d98f6..0d769f3882b5 100644 --- a/pkgs/by-name/se/setools/package.nix +++ b/pkgs/by-name/se/setools/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "setools"; - version = "4.5.1"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "SELinuxProject"; repo = "setools"; tag = version; - hash = "sha256-/6dOzSz2Do4d6TSS50fuak0CysoQ532zJ0bJ532BUCE="; + hash = "sha256-UZisEbHx3zO92gmRQSYsI8TmY9MjCP7AWNAESYklAkk="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c75a39e7f2dc..e15163489769 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA="; + hash = "sha256-3+ODd0/kkXfAchsErLjy6FDHoyVP9VyxbINKMn3N/PM="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index bf3b6ecf3536..b3b13c42c954 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -70,7 +70,9 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace node/build_node_bridge.py \ --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \ - "dst_base = '@signalapp+libsignal-client'" + "dst_base = '@signalapp+libsignal-client'" \ + --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \ + "objcopy = os.getenv('OBJCOPY', 'objcopy')" ''; buildPhase = '' diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 792f226f3ef5..01bf8349b79d 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm run generate pnpm exec electron-builder \ - --dir \ + --linux "dir:${stdenv.hostPlatform.node.arch}" \ --config.extraMetadata.environment=$SIGNAL_ENV \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index f8c91cb06377..7e6f7ebd25a3 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild export npm_config_nodedir=${nodejs} - pnpm run prebuildify + pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}" pnpm run build runHook postBuild diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 51cdca0cfde5..fb40b250e1f5 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -1,6 +1,7 @@ { stdenv, lib, + buildPackages, ninja, gn, python3, @@ -13,6 +14,24 @@ rustc, }: +let + chromiumRosettaStone = { + cpu = + platform: + let + name = platform.parsed.cpu.name; + in + ( + { + "x86_64" = "x64"; + "i686" = "x86"; + "arm" = "arm"; + "aarch64" = "arm64"; + } + .${name} or (throw "no chromium Rosetta Stone entry for cpu: ${name}") + ); + }; +in stdenv.mkDerivation (finalAttrs: { pname = "signal-webrtc"; version = finalAttrs.gclientDeps."src".path.rev; @@ -59,7 +78,11 @@ stdenv.mkDerivation (finalAttrs: { ''; gnFlags = [ + # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags + # are copied from pkgs/applications/networking/browsers/chromium/common.nix. ''target_os="linux"'' + ''target_cpu="${chromiumRosettaStone.cpu stdenv.hostPlatform}"'' + ''pkg_config="${stdenv.cc.targetPrefix}pkg-config"'' "use_sysroot=false" "is_clang=false" "treat_warnings_as_errors=false" @@ -78,7 +101,20 @@ stdenv.mkDerivation (finalAttrs: { "rtc_include_tests=false" "rtc_enable_protobuf=false" - ''rust_sysroot_absolute="${rustc}"'' + ''rust_sysroot_absolute="${buildPackages.rustc}"'' + + # Build using the system toolchain (for Linux distributions): + # + # What you would expect to be called "target_toolchain" is + # actually called either "default_toolchain" or "custom_toolchain", + # depending on which part of the codebase you are in; see: + # https://chromium.googlesource.com/chromium/src/build/+/3c4595444cc6d514600414e468db432e0f05b40f/config/BUILDCONFIG.gn#17 + ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' + ''host_toolchain="//build/toolchain/linux/unbundle:default"'' + ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ''host_toolchain="//build/toolchain/linux/unbundle:host"'' + ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'' ]; ninjaFlags = [ "webrtc" ]; diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index 84f45988bee1..d40715a59c13 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "25.6"; + version = "25.7"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - hash = "sha256-Q7JjLpGwGb36b0gWH6qKcM2mEzPYFq4eiY7/cYW+VIQ="; + hash = "sha256-tkPb5gkeyFAJ2kAflZXUiR7langzn9NEUyjgEGDH+9w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix index 150dd4df0355..ae922f857449 100644 --- a/pkgs/by-name/sp/splash/package.nix +++ b/pkgs/by-name/sp/splash/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "splash"; - version = "3.11.4"; + version = "3.11.5"; src = fetchFromGitHub { owner = "danieljprice"; repo = "splash"; rev = "v${finalAttrs.version}"; - hash = "sha256-e777Te+gOsVDiu/y1VWBDYIW/C6Ojo3gY8qDfJuE5I4="; + hash = "sha256-Zvg8QOpRBb9VmuJCKhwAxy0k04a4FOWDHfgFmIV9ruk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index c57a2f03fdbf..faff6ff7b5e8 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -1,28 +1,29 @@ { lib, - python3, + python3Packages, fetchFromGitHub, ffmpeg, + writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.11"; + version = "4.4.2"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; tag = "v${version}"; - hash = "sha256-9PlqnpUlV5b8g+lctGjVL1Xgf25SS5xqkDaa1bSlxpk="; + hash = "sha256-guQ8fIA20wtCkB5CkU7zg/INE+g8/fvQfIs5TNteQGo="; }; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python3Packages; [ hatchling ]; pythonRelaxDeps = true; dependencies = - with python3.pkgs; + with python3Packages; [ beautifulsoup4 fastapi @@ -45,18 +46,15 @@ python3.pkgs.buildPythonApplication rec { ] ++ python-slugify.optional-dependencies.unidecode; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pyfakefs pytest-mock pytest-subprocess pytest-vcr pytestCheckHook + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$TMPDIR - ''; - disabledTestPaths = [ # Tests require networking "tests/test_init.py" @@ -91,7 +89,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Download your Spotify playlists and songs along with album art and metadata"; homepage = "https://github.com/spotDL/spotify-downloader"; - changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}"; + changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "spotdl"; diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index 72f21319bf04..2af696110db4 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.58"; + version = "4.61"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "39d1ec5dc9f1a7ddc9d578d938a2f983191a93ac"; - hash = "sha256-IImfXP3RWljTwc69ll+z8NIR7vIxhVE1FFRmuCxYn9E="; + rev = "b53ac1d92d4eedbcddd245143a1d70e872bc4b6b"; + hash = "sha256-PEmYVZowNyg9rvh26y6lWo17HMqSYABQgMYYVRXo/Nw="; }; strictDeps = true; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index f0e1eef1a17f..8016457a79db 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -14,13 +14,13 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "14.4.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-TW3HbwNIrcfA1W+fmBMfD0NGKBF/vTKJFuCzzaVfX6I="; + hash = "sha256-Wik0u5NXWhQUWQar9yV4DkAIYZHOaC7FlhAM+YXWFBA="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -63,7 +63,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-AYbvyqvKmhP+2NHxzzcSZFiPBgeh0YOQ2a6t+3fZwYk="; + hash = "sha256-+lpK8SnXvk33hc/Pmv5g88/gQAT5tHgNDOCetOLgmnU="; } ); diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 7e361abeb4de..2f3613ffd003 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -22,13 +22,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = "syncstorage-rs"; tag = version; - hash = "sha256-K4oVobACVLc99WNageaXrkJDeNAn8JQNykhcLZdNYck="; + hash = "sha256-6KgPV2fi3CWEIM2w69kwn3R9w5b5E0mIlE8q8LCy5LE="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoHash = "sha256-xKLSsTI7Uo1MdTMxp04PW31Fai4tmPLMR3IgiGZD45U="; + cargoHash = "sha256-yJhhqaEPsHcjSuf21ZfdLhruPvpeaDDaangxwQZUCdA="; # almost all tests need a DB to test against doCheck = false; diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index a045074d4a24..356da6d8d8fa 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tabby-agent"; - version = "0.30.2"; + version = "0.31.1"; src = fetchFromGitHub { owner = "TabbyML"; repo = "tabby"; tag = "v${finalAttrs.version}"; - hash = "sha256-qg9DcIjsXan6SQY5y+Df4vtAjv6kHNfVVXXUvdCYrRQ="; + hash = "sha256-RbTX8QKiyzERDVS57Looj9xjS9didNKLdiTkDcyQ/uw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 0224cbe2d8aa..3f100fbb6b7c 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { oxalica mlaradji doronbehar + Necior ]; mainProgram = "task"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 0a7e6e89a81a..ac527d0ff600 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.4.0"; + version = "10.5.0"; src = fetchFromGitHub { owner = "sjrc6"; repo = "taterclient-ddnet"; tag = "V${finalAttrs.version}"; - hash = "sha256-SSf9W+1yl7ExHsifbVM5IN4OfZvMdz62xMfdb++38II="; + hash = "sha256-L8tVrflCNafO8AdZhVssBjwt9k5BOkKzxodDTQiOASs="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { # Since we are not building the server executable, the `run_tests` Makefile target # will not be generated. # - # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.4.0/CMakeLists.txt#L3088 + # See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.5.0/CMakeLists.txt#L3167 doCheck = false; preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 36f5f50048bf..069ed9c27927 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.87.0"; + version = "1.88.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-u7zb0ohZlXlnJlgsXEp7ttNtAB4ZF3NXe3lPGpClp5M="; + hash = "sha256-NrRsP/VVcyNbSP/kedDekQsOGtvxKap3CjpTz5dW1TU="; }; - vendorHash = "sha256-6v3ypD+YWvCST5rM6YHUBGeQ5F1lwb2GKPcq/3XJeiY="; + vendorHash = "sha256-yfUCzTaZdjv5qNl71xc2+M2u1hrydDiFgaklk4CKPG0="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix index 8a4e6b39d86f..a1718d619f44 100644 --- a/pkgs/by-name/te/texstudio/package.nix +++ b/pkgs/by-name/te/texstudio/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.8"; + version = "4.8.9"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-e3kQnWjOe5dkFslDZ+pUgsMB0twDZEcQXYUaPtd+jHA="; + hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/textual-paint/package.nix b/pkgs/by-name/te/textual-paint/package.nix deleted file mode 100644 index a512c4e173b7..000000000000 --- a/pkgs/by-name/te/textual-paint/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - fetchPypi, - fetchpatch, -}: - -let - python = python3.override { - self = python; - packageOverrides = _: super: { - pillow = super.pillow.overridePythonAttrs rec { - version = "9.5.0"; - format = "pyproject"; - - src = fetchPypi { - pname = "Pillow"; - inherit version; - hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; - }; - - patches = [ - # fix type handling for include and lib directories - (fetchpatch { - url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; - hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; - }) - ]; - }; - - textual = super.textual.overridePythonAttrs rec { - version = "0.27.0"; - - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - rev = "v${version}"; - hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw="; - }; - }; - }; - }; -in - -python.pkgs.buildPythonApplication rec { - pname = "textual-paint"; - version = "0.1.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "1j01"; - repo = "textual-paint"; - rev = "v${version}"; - hash = "sha256-ubBWK4aoa9+wyUED7CmWwjknWsWauR/mkurDgkKDiY8="; - }; - - nativeBuildInputs = [ - python.pkgs.setuptools - python.pkgs.wheel - ]; - - propagatedBuildInputs = with python.pkgs; [ - pillow - pyfiglet - pyperclip - rich - stransi - textual - ]; - - pythonImportsCheck = [ "textual_paint" ]; - - meta = with lib; { - description = "TUI image editor inspired by MS Paint"; - homepage = "https://github.com/1j01/textual-paint"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "textual-paint"; - }; -} diff --git a/pkgs/by-name/tf/tf/package.nix b/pkgs/by-name/tf/tf/package.nix new file mode 100644 index 000000000000..f59ced6c28a4 --- /dev/null +++ b/pkgs/by-name/tf/tf/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "tf"; + version = "2.11.1"; + + src = fetchFromGitHub { + owner = "dex4er"; + repo = "tf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-EWD6BfOAZR/PucDhJmLStjBNVgXCLW45g8stVhoMyO8="; + }; + + vendorHash = "sha256-lcgLEj6NELZS0LoakbuektO4epieY7ctl8ya1JnXim8="; + + subPackages = [ "." ]; + + preInstallCheck = "make test"; + + meta = { + description = "Less verbose and more shell friendly Terraform"; + mainProgram = "tf"; + homepage = "https://github.com/dex4er/tf"; + changelog = "https://github.com/dex4er/tf/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Tenzer ]; + }; +}) diff --git a/pkgs/by-name/ti/ticpp/package.nix b/pkgs/by-name/ti/ticpp/package.nix deleted file mode 100644 index 5bbc2c31a50b..000000000000 --- a/pkgs/by-name/ti/ticpp/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation { - pname = "ticpp"; - version = "0-unstable-2019-01-09"; - - src = fetchFromGitHub { - owner = "wxFormBuilder"; - repo = "ticpp"; - rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; - sha256 = "0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_TICPP_DLL=1" ]; - - installPhase = '' - cd .. - mkdir -p $out/lib - install build/*.{a,so} $out/lib - mkdir -p $out/include - install *.h $out/include - ''; - - meta = { - description = "Interface to TinyXML"; - license = lib.licenses.mit; - homepage = "https://github.com/wxFormBuilder/ticpp"; - }; - -} diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index a48108d4460a..f6e62e79d4f0 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -22,6 +22,8 @@ makeWrapper, nixosTests, ffmpeg, + autoconf, + automake, }: stdenv.mkDerivation (finalAttrs: { @@ -160,6 +162,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake gettext + autoconf + automake ] ++ lib.optionals stdenv.hostPlatform.isLinux ( with xorg; diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 127f456be4ae..fc1b1813e204 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.13.24"; + version = "0.13.26"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-/QDqeHTa2TT9TOEGype0yG8pUq0VR4ENvwAbAnfqk5A="; + hash = "sha256-beGi4vyp/+FFTBCbKibqIn+d/4NTrj5gEPhXjKLwdtw="; }; - cargoHash = "sha256-1kcpITV2Mj1z46Y8aa0J2WQ6zHJ3WXurgF2Ujh1GnPM="; + cargoHash = "sha256-mtqQFiGE240nUpUspjwfR/EW88Ls0fUyqNvw/ltdGFI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/to/tofu-ls/package.nix b/pkgs/by-name/to/tofu-ls/package.nix index 83a66505191d..68bf8a1de990 100644 --- a/pkgs/by-name/to/tofu-ls/package.nix +++ b/pkgs/by-name/to/tofu-ls/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "tofu-ls"; - version = "0.0.9"; + version = "0.1.0"; src = fetchFromGitHub { owner = "opentofu"; repo = "tofu-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cfkxc6+Pq+sthHvptQ9MS+jYxr+LK42KV8k14vweTX0="; + hash = "sha256-Q/SekYmQGJaYA5OxkUx6wYa6Tf1VXMtgAvRAkHfnuXo="; }; - vendorHash = "sha256-smEjFVqY4AXSzGs8FQRnoFzWrJIu96z0tLajMMusmCA="; + vendorHash = "sha256-rGRhAAT0sGym0f4gkLEP/Xo9zIXO+O2cJJUMxg+miNM="; ldflags = [ "-s" diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix index bccbbe484190..5ca4733fbc76 100644 --- a/pkgs/by-name/tt/ttop/package.nix +++ b/pkgs/by-name/tt/ttop/package.nix @@ -7,13 +7,13 @@ buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-bBwSeB4azLjDTsfi9NFxoVphwUhHGFeJ/AYicYgk0as="; + hash = "sha256-JdUoVP/R3epkx53kMdIflDEuFuJRzCxQY1BgsyVItqM="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index f14cd2a49d4c..df97b6767837 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tun2proxy"; - version = "0.7.14"; + version = "0.7.15"; src = fetchCrate { pname = "tun2proxy"; inherit (finalAttrs) version; - hash = "sha256-rrBlCtimcQJ8487X5wxsWVk20v9UK0+0B6HRdzV5Sj0="; + hash = "sha256-Yyct1yGSXbZf49t4+8hP+V4ydyIi7zyff5IIqrTfJS0="; }; - cargoHash = "sha256-73SHsJUvPTvI3kxkpNI2Go11TWyQ8/SckuQBCkWjixA="; + cargoHash = "sha256-DhfUhjA8/+gmIe+91vVnK7Zca0x0r6lisTxPmg5yM8k="; env.GIT_HASH = "000000000000000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/tw/twitterBootstrap/package.nix b/pkgs/by-name/tw/twitterBootstrap/package.nix index 9123480770df..9010034001a9 100644 --- a/pkgs/by-name/tw/twitterBootstrap/package.nix +++ b/pkgs/by-name/tw/twitterBootstrap/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; - version = "5.3.7"; + version = "5.3.8"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; - hash = "sha256-nuEoO1JVD4UE0VZZTxddacpVp79o771fpi3ZHLJ/qGs="; + hash = "sha256-MljIc8vLHi2B9DdK/qLqZDfZ7ukHcEEHP9gd1XnFums="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/uh/uhd/fix-pkg-config.patch b/pkgs/by-name/uh/uhd/fix-pkg-config.patch new file mode 100644 index 000000000000..481de405f5e9 --- /dev/null +++ b/pkgs/by-name/uh/uhd/fix-pkg-config.patch @@ -0,0 +1,48 @@ +From 32944bbdbf2c7611e72ec9828464978ca42824ce Mon Sep 17 00:00:00 2001 +From: Jakob Kukla +Date: Fri, 12 Sep 2025 10:31:22 +0000 +Subject: [PATCH] cmake: support absolute paths for install dirs in pkg-config + +The GNUInstallDirs module supports absolute paths for CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR. Some package managers like Nix depend on this behaviour. See https://github.com/NixOS/nixpkgs/issues/144170 for the nixpkgs tracking issue. +--- + host/CMakeLists.txt | 12 ++++++++++++ + host/uhd.pc.in | 4 ++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt +index 3e93ea1f0c..4cd0afad9d 100644 +--- a/host/CMakeLists.txt ++++ b/host/CMakeLists.txt +@@ -559,6 +559,18 @@ if(CMAKE_CROSSCOMPILING) + set(UHD_PC_LIBS) + endif(CMAKE_CROSSCOMPILING) + ++# Support absolute paths for LIBDIR and INCLUDEDIR ++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") ++ set(UHD_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(UHD_PC_LIBDIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++endif() ++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(UHD_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(UHD_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++ + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/uhd.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/uhd.pc +diff --git a/host/uhd.pc.in b/host/uhd.pc.in +index 4a5f67c969..f121e2fb70 100644 +--- a/host/uhd.pc.in ++++ b/host/uhd.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@UHD_PC_LIBDIR@ ++includedir=@UHD_PC_INCLUDEDIR@ + + Name: @CPACK_PACKAGE_NAME@ + Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@ diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix index 5ae9f1caa877..bbbb36d674f0 100644 --- a/pkgs/by-name/uh/uhd/package.nix +++ b/pkgs/by-name/uh/uhd/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.8.0.0"; + version = "4.9.0.0"; outputs = [ "out" @@ -57,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-1HnXFeja4g1o64IPUkv/YyP/3upgYsjCVWal8t/hcuc="; + hash = "sha256-XA/ADJ0HjD6DxqFTVMwFa7tRgM56mHAEL+a0paWxKyM="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; # Please don't convert this to a hash, in base64, see comment near src's # hash. - sha256 = "0i5zagajj0hzdnavvzaixbn6nkh8p9aqw1lv1bj9lpbdh2wy4bk0"; + sha256 = "194gsmvn7gmwj7b1lw9sq0d0y0babbd0q1229qbb3qjc6f6m0p0y"; }; # This are the minimum required Python dependencies, this attribute might # be useful if you want to build a development environment with a python @@ -176,6 +176,10 @@ stdenv.mkDerivation (finalAttrs: { dpdk ]; + patches = [ + ./fix-pkg-config.patch + ]; + # many tests fails on darwin, according to ofborg doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/um/umoci/package.nix b/pkgs/by-name/um/umoci/package.nix index 2cf236be2663..a4613aade3ab 100644 --- a/pkgs/by-name/um/umoci/package.nix +++ b/pkgs/by-name/um/umoci/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "umoci"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "umoci"; rev = "v${version}"; - sha256 = "sha256-1nQMrA1GJAeEJ8m8YWMZE10exlx0u023XZakQCaO/YI="; + sha256 = "sha256-+sUqozuIgWoP2aTuP9fPOn0zFYx0gxHfFu71LBHvhhA="; }; vendorHash = null; diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix index 6f2f77c941d5..f7e41b480920 100644 --- a/pkgs/by-name/va/vanguards/package.nix +++ b/pkgs/by-name/va/vanguards/package.nix @@ -5,7 +5,7 @@ }: python312Packages.buildPythonApplication { pname = "vanguards"; - version = "0.3.1-unstable-2023-10-31"; + version = "0.3.1"; pyproject = true; build-system = [ python312Packages.setuptools ]; diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index f0d0581a8c29..9d2f3fec0516 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -661,102 +661,102 @@ "jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=", "pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc=" }, - "io/netty#netty-buffer/4.2.4.Final": { - "jar": "sha256-ng3ULx6rxYQzli76MprNNy3zBcMKaljNF/6xzTL54ok=", - "pom": "sha256-YayQwoVv20mqh1+iPbM7XwOc3AfU8pO00Y5Wsts7EAo=" + "io/netty#netty-buffer/4.2.5.Final": { + "jar": "sha256-3XR8KTv2gur7LDmx74hmHQOu1ULYQIpp5498Bs6b1Xs=", + "pom": "sha256-+jvLNiXnbkm4KPxs2ObM/xxTjyxWLWEDGgKBGItOzJk=" }, - "io/netty#netty-codec-base/4.2.4.Final": { - "jar": "sha256-CvLBN6ijsmS68ViHRw2Faom/cSAloIZSwwOL//v+ZjQ=", - "pom": "sha256-+Rs+uU5/48eizc1rXkVTRUAgvu4hoxc03WZGOXLTXhc=" + "io/netty#netty-codec-base/4.2.5.Final": { + "jar": "sha256-ZevstZFFd/Z5lP6w3UsdVNd+Alh4I4cBA5EAk98XVso=", + "pom": "sha256-Nt7PQ+hpHymPJwGDBf+80tazqfgRw+u2NEOZerFetBI=" }, - "io/netty#netty-codec-compression/4.2.4.Final": { - "jar": "sha256-Y5ccgGYysIOJxtCzydhT3+8EdhjNTPVV8jqZLhVc4Jw=", - "pom": "sha256-RwN70nKjw72l1x7pE/A9C/JVreg2g9V1+2gBRY8KRlw=" + "io/netty#netty-codec-compression/4.2.5.Final": { + "jar": "sha256-GjlLIhGjGWQxAJANs+V+uuAV3Tkp+uV1mGsappWxfgM=", + "pom": "sha256-Mvvtf2zeQ5jkjn3l08jHTD7ymwKIb/tQ1kYkP/lmQiA=" }, - "io/netty#netty-codec-haproxy/4.2.4.Final": { - "jar": "sha256-9FJsPWgZqI8NYXSpA4HiZDHjcICnXbeVvAx4RJIuMQ0=", - "pom": "sha256-wQvuTJBVMBBN7utiD8+SOK+Z9rcpWhZzeaqjBHOsnDI=" + "io/netty#netty-codec-haproxy/4.2.5.Final": { + "jar": "sha256-qdk1CPi0CJhOXCWHfBL89/FV3sq6etzooTyNJCTKQZ4=", + "pom": "sha256-rXDI4xaT6A7R7w0avs3t33YyKBPRuziNJdMXc1OBHfs=" }, - "io/netty#netty-codec-http/4.2.4.Final": { - "jar": "sha256-veaJ3fKU9w8QXQlVz8bXhNHl7k6ncwpzOx/EcoRW2VA=", - "pom": "sha256-xmEFuF/3Bd4cLon3uORV5Ot7CWiSTxWFTe4ZFWL40wA=" + "io/netty#netty-codec-http/4.2.5.Final": { + "jar": "sha256-+ltOm0fVZmxQeEo3/fb70g9DC+6U0lQ+jiJOMZS9shE=", + "pom": "sha256-u2EeuknTKj3hyiYG5Lpi0QNA04FiGWamWvOOnzcVTa0=" }, - "io/netty#netty-codec-marshalling/4.2.4.Final": { - "jar": "sha256-KjqLHmMShP0rU4wRyb00bJP/FtwccLurVY3I8k8aQEQ=", - "pom": "sha256-j3MxT6zWuv0NsDaIVshuKPbKb12Q91l0CoAO0ylea2w=" + "io/netty#netty-codec-marshalling/4.2.5.Final": { + "jar": "sha256-tbMAHA1W6+zjEkoqjf5+nnNQnZqzhCPy4PMe27KdWDY=", + "pom": "sha256-jD+p6mlUF80oxCtDbRfhOLaqW4mJtP7RxLQXZcOeCx0=" }, - "io/netty#netty-codec-protobuf/4.2.4.Final": { - "jar": "sha256-Ixj1IQF97o4OTlD9jV6KGx1HYty2nqmqUqe3n/jHYL8=", - "pom": "sha256-i9PbMlMNXvZ5v/AFthdbO/wLJMmUEQ4s1LVDq9U+m2I=" + "io/netty#netty-codec-protobuf/4.2.5.Final": { + "jar": "sha256-8+kJdquyUHbwQ2mRWU8YmgVojxdOhxIgGiDO+QtdRuU=", + "pom": "sha256-9N2ofsIrP4Scp9QXjM5lVvDURgLX3x/JQ9WFjK1ZcPs=" }, - "io/netty#netty-codec/4.2.4.Final": { - "jar": "sha256-htpiccbS7wbPXkKgO7xnpfB0+XeEZPUS8chMM/v8iak=", - "pom": "sha256-BGQ/YG9suwhDDkNAtE0hmEPQxjzcd1bY7kqZIRvIl+8=" + "io/netty#netty-codec/4.2.5.Final": { + "jar": "sha256-ldefnyrnzpAJD6DhIgCAjZ5K2mKAxRb5xbFbgbc4RSc=", + "pom": "sha256-BoPfFBysofMIKQbfgxoe+GdqTcbTIQUQMDy48HVJ950=" }, - "io/netty#netty-common/4.2.4.Final": { - "jar": "sha256-3VdEhGNmIVTDLgz6CZlgoW7aXwiWBQ5EGVsPwphjg38=", - "pom": "sha256-RXP+DQg7pRLmGQxP8OFeVp0LUT2E6Xw+1kgP/p2Z/iw=" + "io/netty#netty-common/4.2.5.Final": { + "jar": "sha256-SwTG+QaQjqcQARfXUp4FW6To+s9ibTklKVotoiOxOk0=", + "pom": "sha256-20vxaZsgxg214QCuYs49jnZNqu9OGr9MLqKt4kXpzdI=" }, - "io/netty#netty-handler/4.2.4.Final": { - "jar": "sha256-UoC37ITUlAUbqZY5yGeTsE2STqfr2trBUo5m9P6Dksg=", - "pom": "sha256-yPVvwMYP9vqmTX29FwnDWm6B8/L24FaZyPMkH20KhVc=" + "io/netty#netty-handler/4.2.5.Final": { + "jar": "sha256-VPDE56/mSwJ6jkTPqdgsWsyklCFjtlgP6s9N4tpkF8g=", + "pom": "sha256-MK1O0cFi4lwQxYZvc4BXYLl3+Vty/aZcJWFdy/ikc5g=" }, - "io/netty#netty-parent/4.2.4.Final": { - "pom": "sha256-Ri3r3EQgCvZiVkSS/wWtRVxe6HEdB1h+IGh+tmd+MG4=" + "io/netty#netty-parent/4.2.5.Final": { + "pom": "sha256-FTTxAc+z3mlU4XAyaFzkJdZHaVHeA9KeC8egC9rimZs=" }, - "io/netty#netty-resolver/4.2.4.Final": { - "jar": "sha256-FStlMcD5CStqXEDJq3Cc+sJ15DO0wIBQF0B5DTmGOgw=", - "pom": "sha256-1jPP6gJtU2X+yBbtBTbr9CyMcuSNfqPBYs/b/aoZc68=" + "io/netty#netty-resolver/4.2.5.Final": { + "jar": "sha256-f+RoI2Art+TpZvXTCX1JnmOfsmCsbCEB7gALqZlWEnU=", + "pom": "sha256-r5azHqO2vIjoatYM58BZ4j68MNUh4bCWQ1rR/JKAJho=" }, - "io/netty#netty-transport-classes-epoll/4.2.4.Final": { - "jar": "sha256-wRqsFVM/ls3uQ+WL9eexCdJzMupygRH1/WLwNzYVMSg=", - "pom": "sha256-53E1vT0TCN5/AXaGD5yWu5sCYeUzFN0xqnb+8zs0LFE=" + "io/netty#netty-transport-classes-epoll/4.2.5.Final": { + "jar": "sha256-t4GKIt8uuYksOHNM5RoTo/xz9gRbLAwXSI2sb0+xGuE=", + "pom": "sha256-JSTG6SuvgtaRLethiDY52MNtSsxhGEF4Zk3xcQxvFhs=" }, - "io/netty#netty-transport-classes-io_uring/4.2.4.Final": { - "jar": "sha256-BheCAqyclFrUBFqDEAsGsMkXfmzIHtNr9UCEMz4L7l0=", - "pom": "sha256-Dh9r8LfmTCgz4gLrcsk4zA+nUpDYdGBqYdxVmyf8G9k=" + "io/netty#netty-transport-classes-io_uring/4.2.5.Final": { + "jar": "sha256-eGqI2zhSIo1QyL1V5hyp0EmurxWAK4VzertMD7kC2Ec=", + "pom": "sha256-JGGbc9y7TaRAylfgYtSJ3vUR7cGcALy4tP/gCwBd86g=" }, - "io/netty#netty-transport-classes-kqueue/4.2.4.Final": { - "jar": "sha256-+proWJoZUiMF0MBMaolR/IAZ0c/9tE+F4Eu4xkqVVLg=", - "pom": "sha256-tDNOT3hUZ24tR9jFwh08/i9ljFLePpJTy3pbbxG2u4k=" + "io/netty#netty-transport-classes-kqueue/4.2.5.Final": { + "jar": "sha256-P45empwDvk2wIVPiuj0o8dfEYEYXtH7J8nqZqAl69wg=", + "pom": "sha256-fEXK6S/QjZMPhrnsd16WiBie+Ms0VZMYcjAZi0pB4Dg=" }, - "io/netty#netty-transport-native-epoll/4.2.4.Final": { - "jar": "sha256-FKIGZ7wNJcSvmgb45xLf45Kqs/6gLO3NczPinhrvDqU=", - "pom": "sha256-fX9QgM6meAVW0RnmQVphprCSznIrHiXS37MEB7SdsIM=" + "io/netty#netty-transport-native-epoll/4.2.5.Final": { + "jar": "sha256-gMmYUyacv1OSQ2C16Z2+gbCZFcqX3XHAFkp5ZkrT7RQ=", + "pom": "sha256-XXjoG/qvHv8MoaAWwFY6fmpskg9vYAdjXbRyMdtIHhs=" }, - "io/netty#netty-transport-native-epoll/4.2.4.Final/linux-aarch_64": { - "jar": "sha256-zn4qRb6UJ19z8r/KOouchPvz3u7bL70XQvB5EvhoVTk=" + "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-aarch_64": { + "jar": "sha256-58rjjoCrVXxuqCnxSlv3/3QG9ZEr09pnCJWiegFUQwo=" }, - "io/netty#netty-transport-native-epoll/4.2.4.Final/linux-x86_64": { - "jar": "sha256-ZzzEBzWkDbGFsYQ3zoxzSQcMxhq45y7BxPmgD8Y9wzA=" + "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-x86_64": { + "jar": "sha256-h+TjnoNCHO1Y9OCdzJkgpzZUTxE6lurb8SgWsEViKvI=" }, - "io/netty#netty-transport-native-io_uring/4.2.4.Final": { - "jar": "sha256-0MAryHaf9Bjxg19rSbTup/14fFsQvYqPB/xjcPFayZY=", - "pom": "sha256-CSpxzbsHg6QCpnn1DuZ+yc0w4UumZCWk8Ly1XiFC5GU=" + "io/netty#netty-transport-native-io_uring/4.2.5.Final": { + "jar": "sha256-G6yc5FBTpSmQEf2W9NOywpFnrH4R0jig+7/IgE3MKrw=", + "pom": "sha256-z6EQRHOtojYkkB1k7iBM61Euh4IeaRgSS2DpCLAkQgY=" }, - "io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-aarch_64": { - "jar": "sha256-eUuBBohdL6LSaZCutzLc4MG0MY88nw1nHa385g47nT4=" + "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-aarch_64": { + "jar": "sha256-VYOo0DLAclkVfTEv+wQjbvk3yFakpp1ZpdmlA0O4EDY=" }, - "io/netty#netty-transport-native-io_uring/4.2.4.Final/linux-x86_64": { - "jar": "sha256-4fbWenPelBRbWocO+xVweUvBnSmsBI/pcbnLuqdtR0c=" + "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-x86_64": { + "jar": "sha256-8Tb8qT44ZzaOwvQDMrPTddjCKY06yNLqOohtIs6lh20=" }, - "io/netty#netty-transport-native-kqueue/4.2.4.Final": { - "jar": "sha256-RKqm6ZpJLlTNR6RB7QZGhWP46Z6JOGIpEpqJRtlIOJI=", - "pom": "sha256-snXJGraVPRi+ZaOk1a9JyD0wOupJfTxkrygGnd8HsYk=" + "io/netty#netty-transport-native-kqueue/4.2.5.Final": { + "jar": "sha256-rr9gy2LUD+q/pjaVUe5aj6pELNixgXL8LxQoFbsmUDw=", + "pom": "sha256-TtTZxdXYadsSG88D0nG2by6GCEsnY+W9TZcdiwp82yo=" }, - "io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-aarch_64": { - "jar": "sha256-dTWoJPWe3dACXmTVLzzwaT5n5Iuep5f0xUI8cEgl1+g=" + "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-aarch_64": { + "jar": "sha256-T7yUPQqQu3FC7qDMqdZYXIHcN5g+ANxwhKOSEjJpkUo=" }, - "io/netty#netty-transport-native-kqueue/4.2.4.Final/osx-x86_64": { - "jar": "sha256-CRp9eTJ8DcuA2iogxG8KS5b4I5tfuqcicDEyda8DUrI=" + "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-x86_64": { + "jar": "sha256-w/pmI401PBlBmwFysdazuaS1mvOgS/bsAiXZamk0D9o=" }, - "io/netty#netty-transport-native-unix-common/4.2.4.Final": { - "jar": "sha256-0uT1oUevhUb1JQ8fp9G8CLDyjhXw8xlcfyTrsYYqQ8E=", - "pom": "sha256-Oel7uwR+M9yMUXn9M1q4hDKfIeJUAEg3QuYZiBT2sVg=" + "io/netty#netty-transport-native-unix-common/4.2.5.Final": { + "jar": "sha256-znLyQj2jEvnZZV/lT0oLVZneVPuRYOvX7D+ycwr4q8M=", + "pom": "sha256-TQGNBAkDVC8OitiqHHYeOfQ67Ou5GBCanvP1N+WRcmI=" }, - "io/netty#netty-transport/4.2.4.Final": { - "jar": "sha256-x4c4WLzyXVkhH5nT3TWlLWRO/FEWzQoAzUQCs9I8Y3I=", - "pom": "sha256-tq1ktxu0hdLgxgtaS5HQnb/UEymeZ5nn11kpRgmpfpY=" + "io/netty#netty-transport/4.2.5.Final": { + "jar": "sha256-ArTpqs4SYLENANeBb7Quoj+wVobte3+45q1Ozz2mH/8=", + "pom": "sha256-PcP4jk6N0k7Bf6EDeuRDJGOtR6Iv8jjmuD/RRJeCMPQ=" }, "it/unimi/dsi#fastutil/8.5.15": { "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=", diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 0b90228fd7ea..172ad0408743 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-08-31"; + version = "3.4.0-unstable-2025-09-07"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "bfd15e1a816b0928d51abef03333166ecc225358"; - hash = "sha256-+BM+oaV+CjqOErSl03nDYh9kKxq2gz/orsi66+Cn3xk="; + rev = "6e80f57739d5faea3b4e85c993c3649fe5e98cd7"; + hash = "sha256-w6uo19FPs8lhAPcqqWABPnyQRTe5G5bsX+IfVAXcwzo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix index 21576eaccd80..97a962fbf738 100644 --- a/pkgs/by-name/vo/volk/package.nix +++ b/pkgs/by-name/vo/volk/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, python3, enableModTool ? true, @@ -10,22 +9,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = "volk"; tag = "v${finalAttrs.version}"; - hash = "sha256-R1FT5sbl0fAAl6YIX5aD5CiQ/AjZkCSDPPQPiuy4WBY="; + hash = "sha256-9bURoGyjdNoKCcgGvZL9VygQqUQxOrwthp154Was2/s="; fetchSubmodules = true; }; - patches = [ - # https://github.com/gnuradio/volk/pull/766 - (fetchpatch { - url = "https://github.com/gnuradio/volk/commit/e46771a739658b5483c25ee1203587bf07468c4d.patch"; - hash = "sha256-33V6lA4Ch50o2E7HPUMQ2NPqHXx/i6FUbz3vIaQa9Wc="; - }) - ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ]; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index ef1b9673c580..183da4f5b3b0 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "vscode-js-debug"; - version = "1.102.0"; + version = "1.104.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-js-debug"; rev = "v${version}"; - hash = "sha256-YRD+KfOo1uxqefcnbaKSKB45ZVAE0jrR7X2rVTmybHA="; + hash = "sha256-CoR3ezhyIQtt5ZlTjfJSNvfMX47U5xSJdzsMN5dkUGI="; }; - npmDepsHash = "sha256-SQnf9hS869V0wUYZDBq2b1f9n23QY4Fwjar1gTuwECQ="; + npmDepsHash = "sha256-bX4p0LQIL4XF0rL5dnBAvR6Ut+YZ1H676Mu/uCedNtU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/watcher/package.nix b/pkgs/by-name/wa/watcher/package.nix index 8f53e767e215..419b49a9776f 100644 --- a/pkgs/by-name/wa/watcher/package.nix +++ b/pkgs/by-name/wa/watcher/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "watcher"; - version = "0.13.6"; + version = "0.13.8"; src = fetchFromGitHub { owner = "e-dant"; repo = "watcher"; tag = version; - hash = "sha256-mcnItyXjU4ylNvM6QLlmUDybhwdxi7D6e3z8saZubMY="; + hash = "sha256-sQel+W9J8ExWkSEYd6Wjw2M9VgTIax+8zadI982fH4U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 9cdc708575b4..100335da7d40 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -31,7 +31,7 @@ let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.11.3"; + version = "0.11.5"; passthru.updateScript = ./update.sh; @@ -62,8 +62,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; hash = selectSystem { - x86_64-linux = "sha256-pcYJHj8Jt5RazHZNAgXuSL6mu0MnUVqM9lmAUVJvGfg="; - aarch64-linux = "sha256-HAnlEHhbl15W/ynRWTG7TLtGkC7EPPpJzWQfMK52loA="; + x86_64-linux = "sha256-3HPDjrY8hMMZFqzncEtdr2ap2HT3UZvEDv6PO1Hn/KE="; + aarch64-linux = "sha256-lDlMlGgPthBIMA3HIj8ZudIbQA98/tXD7d/Mc2ZZ3t0="; }; }; @@ -136,8 +136,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-KmH5az2p2dRC1UCXCt7SBVfomj6dDaAtevIai1YIYO0="; - aarch64-darwin = "sha256-SdZY5MPi+oP3+ywW3BASMzYr16QiYS3MXyPs9jCqD+Y="; + x86_64-darwin = "sha256-5TViV0XG9TTqnNHY7vYClxrczHE8gpMb+m0Euvfu+iQ="; + aarch64-darwin = "sha256-RKptVWAEO5YKbyitYEyGxVf/NoRSeT1BfkXPwHmOvkc="; }; }; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index ef29301d1547..e0bbac798ad8 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.4", + "version": "1.12.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-arm64-1.12.4.zip", - "sha256": "b45050d9a38ca88b4768985f7007d2c222931d5e113c35bd2eeab9611873b6c8" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-arm64-1.12.5.zip", + "sha256": "5b114d4dfea8ccc63a0bfbbbc07c0883a4638e0edaaca60fed3aefd0cdf9747f" }, "x86_64-darwin": { - "version": "1.12.4", + "version": "1.12.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-x64-1.12.4.zip", - "sha256": "007207ae3fc620da956874c6d7162cd1d0728a0501b4227197f9d1a659b2e2b4" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-darwin-x64-1.12.5.zip", + "sha256": "21b27ec4ed2e3b5e721b44251f56b6784b917b82dc58ed63e90e83b90830e63a" }, "x86_64-linux": { - "version": "1.12.4", + "version": "1.12.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-linux-x64-1.12.4.tar.gz", - "sha256": "bda6a3bd74524c3e70a7e1a53b63fda7f7ed1840707e4a1b0a7ead5f3b2c48a2" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/64804081c3f9a1652d6d325c28c01c3f5882f6fb/Windsurf-linux-x64-1.12.5.tar.gz", + "sha256": "a73bb9f23f8a9acb36d0d858b5c3c247f8ab2c66a8030852cea539c0ae8c4876" } } diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index 59a7ce4f8d28..8977315072c0 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = "wvkbd"; tag = "v${version}"; - hash = "sha256-Vjbj3rxTe60Q+6IcX43WCBHMyPFECjc8w9D6qed0w0I="; + hash = "sha256-RfZbPAaf8UB4scUZ9XSL12QZ4UkYMzXqfmNt9ObOgQ0="; }; postPatch = '' diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix index 3f20b207094d..76b8eb880614 100644 --- a/pkgs/by-name/xa/Xaw3d/package.nix +++ b/pkgs/by-name/xa/Xaw3d/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - imake, - gccmakedep, bison, flex, pkg-config, @@ -23,13 +21,10 @@ stdenv.mkDerivation rec { url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY="; }; - dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex - imake - gccmakedep ]; buildInputs = [ libXext diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix index 9f3cec690967..b4db43833006 100644 --- a/pkgs/by-name/xa/xarchiver/package.nix +++ b/pkgs/by-name/xa/xarchiver/package.nix @@ -22,14 +22,14 @@ }: stdenv.mkDerivation rec { - version = "0.5.4.25"; + version = "0.5.4.26"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - hash = "sha256-pLNAgyYqujk+xvHZjq98kzTG47G4C2JvSTDoS7UTNeo="; + hash = "sha256-s6lVKtWJRAFrkUYUwKGH+XNTGi/L+Zt0kSWIekBUWYs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xl/xlife/package.nix b/pkgs/by-name/xl/xlife/package.nix index e6f58c5da24a..baf9f80f80eb 100644 --- a/pkgs/by-name/xl/xlife/package.nix +++ b/pkgs/by-name/xl/xlife/package.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { description = "Conway's Game of Life and other cellular automata, for X"; license = licenses.hpndSellVariant; maintainers = with maintainers; [ djanatyn ]; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json index fa99182403a7..617ac4b0c00f 100644 --- a/pkgs/by-name/ya/yandex-cloud/sources.json +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -1,25 +1,25 @@ { - "version": "0.161.0", + "version": "0.163.0", "binaries": { "aarch64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.161.0/darwin/arm64/yc", - "hash": "sha256-Fn1qUIJELf2dkQd1J8aKz28f8h8VFdWkbCV6iIfpl3A=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.163.0/darwin/arm64/yc", + "hash": "sha256-gCsTjvBAUcfVYTJxHrQFdSmDHCeMc6Az/ZVlJgChAYg=" }, "aarch64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.161.0/linux/arm64/yc", - "hash": "sha256-N/YqWKd86JsIheXuI2xUr05n6Anw7hFlXTRZy0jWjns=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.163.0/linux/arm64/yc", + "hash": "sha256-h66Yml2c0ndv2WVLdiuaZ6GFN5oPuYuG2y9Mp61/dxk=" }, "i686-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.161.0/linux/386/yc", - "hash": "sha256-zoH5Dor1+E/dSVHd03ih2EJ663QAc9SJ8zFm6GoggIc=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.163.0/linux/386/yc", + "hash": "sha256-kf97XeKJNn+OH6UCOv875+ZHqZoX1la4Xf9IoJT/DqU=" }, "x86_64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.161.0/darwin/amd64/yc", - "hash": "sha256-iBiaPp7L9JJ5EXqJrCflOdwvjT1ISmKWlZhWdWH2qCo=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.163.0/darwin/amd64/yc", + "hash": "sha256-33y4fQWnMuXd5ABJrio5/b7sEbsBmzmMFuK1XEMYz9E=" }, "x86_64-linux": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.161.0/linux/amd64/yc", - "hash": "sha256-Nd1oh64tzJW7kVq5snVA2yvmht+LKH51aDlt5V0wCd0=" + "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.163.0/linux/amd64/yc", + "hash": "sha256-MhkjcEyHiEUA3//0g8putCUeBopl0wQlmUFR6meXLOQ=" } } } diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index f00570d168aa..55d68912fa40 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -29,13 +29,13 @@ assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be with assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0"; stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.61.1"; + version = "5.63.1"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-/PpIlje7wXHTEI/ymbPsX3k7uYNKMrcjHrmfnr6QNo4="; + hash = "sha256-z+gmUG0/7ykF42+OlFGZC268Tj8+vpfgZRYrW4otpfM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index fbb598419f3b..a5e0dfc5e9cc 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,6 +1,6 @@ { - "version": "5.57.0", - "exe_name": "Yandex_Music_x64_5.57.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.57.0.exe", - "exe_hash": "sha256-FIr77eH0ksKSLDJBbyTSd/Qkwd1UFc/VFJ3GEnbOD90=" + "version": "5.63.1", + "exe_name": "Yandex_Music_x64_5.63.1.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.63.1.exe", + "exe_hash": "sha256-mGDjo/HjRRWtCGV95vtBwZpUepR/5opy6NQpM3HBVHo=" } diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix index aa97c2eda20d..c074527301c5 100644 --- a/pkgs/by-name/ya/yaru-theme/package.nix +++ b/pkgs/by-name/ya/yaru-theme/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "25.10.1"; + version = "25.10.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-+ZJxzJkWl/yIX1MtpJ72O2phRh4FZY8CTDPAB15jCSU="; + hash = "sha256-3NTqRmAdO3+9e9B7Fe0B9PPeMUBAmin+51cfqAijV0w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index bf62c8369e08..e7c9c4c3fc91 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zashboard"; - version = "1.101.1"; + version = "1.103.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-yUmslvMjkvGvLBL8RtPHBc+kjBL6QGsO1W2vs4PVQ6Q="; + hash = "sha256-7XO4VjAwa6yjW5gxUOEXhkNYH24iP5iVnYtP+CKyfaU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 64048fd9dfee..1503ce1908b1 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.203.4"; + version = "0.203.5"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-fDjKBZvXla6K0OLs40igxSe1Xn+uMD81F0PbIur8Y7o="; + hash = "sha256-Gx/N06atH9D1caAqaTzeLKBXmYlUpawopB9yzboi0tA="; }; patches = [ @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-bdK5CnWLswdaHbEB/Tt7+K6Qr5R2Cs9ik7KHCQkvn1g="; + cargoHash = "sha256-gPiQ6izmEhhGI+XficgALlraOKvapd2iwrWpSeiqsZ8="; nativeBuildInputs = [ cmake diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 517de6438917..d341218101fe 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-dgeB+N0Ye/O5y/o/yc9Vj1Ia8d2uUOGjxBddyPHaDQc="; + hash = "sha256-GMRtvAG6jdnm+WxXOZb5eOyX1rEqzk7tHZbjSI9/47g="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index cc18019d0332..4a4126538b12 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoconf-archive, + autoreconfHook, pkg-config, gettext, itstool, @@ -21,6 +23,7 @@ gtk3, polkit, marco, + mate-common, mate-desktop, mate-menus, mate-panel, @@ -29,24 +32,31 @@ systemd, hicolor-icon-theme, wrapGAppsHook3, + yelp-tools, mateUpdateScript, }: stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.28.0"; + version = "1.28.1"; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6/LHBP1SSNwvmDb/KQKIae8p1QVJB8xhVzS2ODp5FLw="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "mate-control-center"; + tag = "v${version}"; + hash = "sha256-rsEu3Ig6GxqPOvAFOXhkEoXM+etyjWpQWHGOsA+myJs="; }; nativeBuildInputs = [ + autoconf-archive + autoreconfHook pkg-config gettext itstool desktop-file-utils + mate-common # mate-common.m4 macros wrapGAppsHook3 + yelp-tools ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 444d483aefdf..dcdf66de7e33 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "8.2.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - hash = "sha256-dginzwQrzcgnVdRO54cGPVh6+yVx0zLsFeeAVhxWFnE="; + hash = "sha256-78tj/FuB5xzit5W0HsldQS5WEmNtOFmTsPcEFqBQOtc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index bd03337514d0..0dc979e18b85 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -11,6 +11,7 @@ wrapGAppsHook3, editorconfig-core-c, granite, + gsettings-desktop-schemas, gtk3, gtksourceview4, gtkspell3, @@ -25,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - hash = "sha256-pL/xyD9jwuPixbVdjPa3vdZWHxI+T2ARI4BvcTV61jc="; + hash = "sha256-4IGun7MnrMRmpXD0Kxm/ND4C3pFVhjHqDeP6jUmRg7k="; }; strictDeps = true; @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ editorconfig-core-c granite + gsettings-desktop-schemas gtk3 gtksourceview4 gtkspell3 diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index be430278963a..89c4f06872b5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "7.1.4"; + version = "7.1.5"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - hash = "sha256-z7LkQ/lc2pv73VBdKRKWUKWemTbX6xMtCmrgqK5QIZw="; + hash = "sha256-fS285BRTP/i50WE4oM+xgoj6cBgas+dQ6WdK9WebURQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 364cf9f59508..13c8de063acd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "8.1.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - hash = "sha256-mTTcavuxnRSBiifFpga14xPReHguvp9wIUS71Djorjk="; + hash = "sha256-H43mRPEujs6A4Bk2uC3mP91Hp5I8gojaagoXUT/5eW8="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 148cd094115e..e3f3b1f8453f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "7.1.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-B3loX1yAUQktqNztikUCOHM1DgIu48fMFFol1N4BN7A="; + sha256 = "sha256-7zp/GwM+aSQie82asX6yFPSPUxtzeyxCwdr8DWc0LQk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index bd7a4cee09ee..5263899d4221 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -14,12 +14,12 @@ let pname = "ex_doc"; - version = "0.38.3"; + version = "0.38.4"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-mi8AE9LfmWtgiVvoaH7aZy0/KlUvneiyEqop6015b2E="; + hash = "sha256-/gZczKm/IF5QQemrdcda9oKVIGDFSqdiu8YrBwT6Mtk="; }; in mixRelease { diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix index 1143e960a161..8c13a4ec29be 100644 --- a/pkgs/development/compilers/elm/packages/elm-review/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "elm-review"; - version = "2.13.2"; + version = "2.13.4"; src = fetchFromGitHub { owner = "jfmengels"; repo = "node-elm-review"; rev = "v${version}"; - hash = "sha256-HQ7ilGfw/sMXMQVoJQAj31LbyJfdCfbrZ22gTh1vbD8="; + hash = "sha256-rhNLIShZERxrzdTdrPcthTQ+gHUikgR0jchBfcBDGTo="; }; - npmDepsHash = "sha256-YuN04MAKSu4InfGIS0EIZiNpSbLHA7/WzJiMFWY0Tqk="; + npmDepsHash = "sha256-mI94fYNKZ9Jx1Iyo/VjZqaXQ64tZA2S8mtn5l6TtCSc="; postPatch = '' sed -i "s/elm-tooling install/echo 'skipping elm-tooling install'/g" package.json diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index fdd972ef46d7..29b2c9664794 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "loongarch64-linux" "mips64el-linux" "mipsel-linux" + "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" diff --git a/pkgs/development/libraries/qwt/6_1.nix b/pkgs/development/libraries/qwt/6_1.nix index bf5a4c35a702..e5c5196cbb73 100644 --- a/pkgs/development/libraries/qwt/6_1.nix +++ b/pkgs/development/libraries/qwt/6_1.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = licenses.qwt; + license = with lib.licenses; [ + lgpl21Only + qwtException + ]; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 7ff4c929e486..36c82a030550 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; + license = with lib.licenses; [ + lgpl21Only + qwtException + ]; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/ocaml-modules/bitwuzla-cxx/default.nix b/pkgs/development/ocaml-modules/bitwuzla-cxx/default.nix index f8daec215ef2..6995ac461009 100644 --- a/pkgs/development/ocaml-modules/bitwuzla-cxx/default.nix +++ b/pkgs/development/ocaml-modules/bitwuzla-cxx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.8.0"; + version = "0.8.2"; in buildDunePackage { @@ -17,7 +17,7 @@ buildDunePackage { src = fetchurl { url = "https://github.com/bitwuzla/ocaml-bitwuzla/releases/download/${version}/bitwuzla-cxx-${version}.tbz"; - hash = "sha256-t8Vgbiec5m6CYV8bINJqs6uhx0YAJcRZeaWRGNoD6AQ="; + hash = "sha256-cfYQBY/Nwf9XyK5clRPxf6ejqNRn/GugVFMKBm3BEME="; }; propagatedBuildInputs = [ zarith ]; diff --git a/pkgs/development/ocaml-modules/mirage-mtime/default.nix b/pkgs/development/ocaml-modules/mirage-mtime/default.nix index 5293a65c7eee..e2e7aec70a56 100644 --- a/pkgs/development/ocaml-modules/mirage-mtime/default.nix +++ b/pkgs/development/ocaml-modules/mirage-mtime/default.nix @@ -3,7 +3,7 @@ fetchurl, buildDunePackage, mtime, - version ? "5.0.0", + version ? "5.2.0", }: buildDunePackage { @@ -13,7 +13,7 @@ buildDunePackage { src = fetchurl { url = "https://github.com/mirage/mirage-mtime/releases/download/v${version}/mirage-mtime-${version}.tbz"; - hash = "sha256-IwdaAyZyj8gfRPxQP9SOwb28AbtVy9PY7qcr0Pns9GU="; + hash = "sha256-kaBDUqQF1SFecku85iRnX9ji18TjbTIlz4BlRuRAib8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-ptime/default.nix b/pkgs/development/ocaml-modules/mirage-ptime/default.nix index 9136bdce302c..8d981684899a 100644 --- a/pkgs/development/ocaml-modules/mirage-ptime/default.nix +++ b/pkgs/development/ocaml-modules/mirage-ptime/default.nix @@ -3,7 +3,7 @@ buildDunePackage, fetchurl, ptime, - version ? "5.0.0", + version ? "5.1.0", }: buildDunePackage { @@ -13,7 +13,7 @@ buildDunePackage { src = fetchurl { url = "https://github.com/mirage/mirage-ptime/releases/download/v${version}/mirage-ptime-${version}.tbz"; - hash = "sha256-1VNWBGjVuU2yWwVzjCSZ8pDuZrFKwitDAuZn8fpENHE="; + hash = "sha256-6bPbMTZeGolRMMN4nmrc+ZZ3HqjnAWtj4V7L4fOKKfY="; }; propagatedBuildInputs = [ ptime ]; diff --git a/pkgs/development/ocaml-modules/mirage-sleep/default.nix b/pkgs/development/ocaml-modules/mirage-sleep/default.nix index 13223546ebfc..7e04690e81c5 100644 --- a/pkgs/development/ocaml-modules/mirage-sleep/default.nix +++ b/pkgs/development/ocaml-modules/mirage-sleep/default.nix @@ -4,7 +4,7 @@ fetchurl, lwt, duration, - version ? "4.0.0", + version ? "4.1.0", }: buildDunePackage { @@ -13,7 +13,7 @@ buildDunePackage { src = fetchurl { url = "https://github.com/mirage/mirage-sleep/releases/download/v${version}/mirage-sleep-${version}.tbz"; - hash = "sha256-J7cw7sE3EE3BIhSdwD1KV3VeXjEqviVmys3LgGhEE/A="; + hash = "sha256-CoHl4LgGbADtDvWb3q0u8aMh2jHT9Gvt47vk0Pzp2bs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 5ea7ed0f7ee0..b414744f617b 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -9,16 +9,16 @@ buildDunePackage rec { pname = "tdigest"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "SGrondin"; repo = pname; rev = version; - sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic="; + sha256 = "sha256-faJ8ZQ7AWDHWfyQ2jq6+8TMe4G4NLjqHxYzLzt2LGh4="; }; - minimalOCamlVersion = "4.14"; + minimalOCamlVersion = "5.1"; # base v0.17 compatibility patches = [ ./tdigest.patch ]; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 52fa0e4b74b7..2d4000abe649 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; tag = "v${finalAttrs.version}"; - hash = "sha256-Aktr7mU2KP8Io6H0qXii1sVYkgb8wArYIgJ+OFb+/ao="; + hash = "sha256-ot4akuKhNtEXukiDSy69q75phx6EvkJsL0XHAN+el+M="; }; - vendorHash = "sha256-CAsDHwv+oLoiLJ4pUdVvq4w8wD0QsIfYG/AIXASETqI="; + vendorHash = "sha256-S5NCV3wd/EA282NA0Wbtj7gbZw9YU835cr5CmpAnapc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/backports-asyncio-runner/default.nix b/pkgs/development/python-modules/backports-asyncio-runner/default.nix new file mode 100644 index 000000000000..d94a22477932 --- /dev/null +++ b/pkgs/development/python-modules/backports-asyncio-runner/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + pytestCheckHook, + fetchFromGitHub, + hatchling, + hatch-fancy-pypi-readme, +}: + +let + pname = "backports-asyncio-runner"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "samypr100"; + repo = "backports.asyncio.runner"; + tag = "v${version}"; + hash = "sha256-F8x7MZgu0VItH7kBke7C7+ZBoM6Iyj8xOeQ2t56ff3k="; + }; +in +buildPythonPackage { + inherit pname version src; + pyproject = true; + + build-system = [ + hatch-fancy-pypi-readme + hatchling + ]; + + pythonImportsCheck = [ "backports.asyncio.runner" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + # These tests depend on the test.test_asyncio module in cpython which is + # removed at build time. + disabledTestPaths = [ + "tests/test_tasks_py38.py" + "tests/test_tasks_py39.py" + "tests/test_tasks_py310.py" + ]; + + meta = { + changelog = "https://github.com/samypr100/backports.asyncio.runner/releases/tag/${src.tag}"; + description = "Backport of Python 3.11 asyncio.Runner"; + homepage = "https://github.com/samypr100/backports.asyncio.runner"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ detroyejr ]; + }; +} diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix new file mode 100644 index 000000000000..4c1a87281cf1 --- /dev/null +++ b/pkgs/development/python-modules/biocutils/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pytest-cov-stub, + setuptools, + setuptools-scm, + scipy, + pandas, + numpy, +}: + +buildPythonPackage rec { + pname = "biocutils"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BiocPy"; + repo = "BiocUtils"; + tag = "${version}"; + hash = "sha256-4LzXBP/cp+nqIOM5QZIa1QptkSfv3fqdACHEHjJUtsw="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + pandas + scipy + ]; + + pythonImportsCheck = [ "biocutils" ]; + + meta = { + description = "Miscellaneous utilities for BiocPy, mostly to mimic base functionality in R"; + homepage = "https://github.com/BiocPy/BiocUtils"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +} diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index c8cc0d1fd416..1ca3d047413b 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.10.7"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${version}"; - hash = "sha256-hFM3xZzal+i4H8wF83LDEL4nAJE1d59LNQgkcrLSE80="; + hash = "sha256-tYs+aZp/QbM166KNj4MjIjqS6LcuDCyXwghSoF5rj4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index a89f8f030a0e..189729fb9bd7 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, - fetchFromGitHub, - poetry-core, construct, + fetchFromGitHub, pytestCheckHook, + uv-build, }: buildPythonPackage rec { pname = "construct-classes"; - version = "0.1.2"; - format = "pyproject"; + version = "0.2.2"; + pyproject = true; - # no tests in PyPI tarball src = fetchFromGitHub { owner = "matejcik"; repo = "construct-classes"; - rev = "v${version}"; - hash = "sha256-l4sVacKTuQbhXCw2lVHCl1OzpCiKmEAm9nSQ8pxFuTo="; + tag = "v${version}"; + hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ uv-build ]; - propagatedBuildInputs = [ construct ]; + dependencies = [ construct ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -31,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parse your binary data into dataclasses"; homepage = "https://github.com/matejcik/construct-classes"; + changelog = "https://github.com/matejcik/construct-classes/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index c4cd3561e851..ae7d6675ea74 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.10"; + version = "0.99.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UAK7eleaUwLT22Nzjv4+nSUy6lSm9jAXbTUmQW/+AKI="; + hash = "sha256-IWnAUlLA776JfzRvBoMybsJYVL6rHQxkMN9ukDpXsxU="; }; # Workaround for https://github.com/ethanfurman/dbf/issues/48 diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index 01ccabde9c0b..55f560f406e8 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.2.2"; + version = "5.2.5"; pyproject = true; src = fetchFromGitHub { owner = "typeddjango"; repo = "django-stubs"; tag = version; - hash = "sha256-kF5g0/rkMQxYTfSrTqzZ6BuqGlE42K/AVhc1/ARc+/c="; + hash = "sha256-v+MlMy9XABb9gw3U6Xv+aXXF6AZuvu+OBdU5+8tE9Oo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index a0279abb7c6d..1e3a4eb4392d 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.9.0"; + version = "3.9.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-UmgxEPEm6fNf4FbZ7CIcSEIaJg4sReI0pnkWwPdrJvQ="; + hash = "sha256-2yoXV6iE9AGjdfQtOSqoMWlNtTM2ueL+cl5IcCHguDg="; }; build-system = [ diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index ba9adb6d2393..81b93b87d5bb 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dploot"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-WY6SEBmvsvLtn6+KE4upL2n39kuGO4aK3cyGFOd9xIo="; + hash = "sha256-xCw4mAP9CUtcTeQQ//4zI0BcQUmTai9hvYSZ9F9k4rc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 730fa02b7204..f61cb7275e61 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "fasteners"; - version = "0.19"; + version = "0.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "harlowja"; repo = "fasteners"; tag = version; - hash = "sha256-XFa1ItFqkSYE940p/imWFp5e9gS6n+D1uM6Cj+Vzmmg="; + hash = "sha256-h8hlx3yl1+EgqCGE02O+wLejwxgJ5ZOs6nPrYUtHwn0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index b7f7646f18bd..3735dab43ff8 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -1,18 +1,28 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, - cmake, + + # build-system + scikit-build-core, cython, oldest-supported-numpy, - scikit-build, - setuptools, - tbb, + + # nativeBuildInputs + cmake, + ninja, + + # buildInputs + tbb_2022, + nanobind, + + # dependencies numpy, rowan, scipy, + parsnip, + + # tests pytestCheckHook, python, gsd, @@ -22,25 +32,17 @@ buildPythonPackage rec { pname = "freud"; - version = "3.3.1"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "freud"; tag = "v${version}"; - hash = "sha256-3THoGPjfaDy2s96+Oaf1f2SDzxTaqRDQlNa3gZ/ytUU="; + hash = "sha256-JX3pbzNTj85UTAtWYnDRvtJSjS27qgY/vitaAjmXbjA="; fetchSubmodules = true; }; - patches = [ - # https://github.com/glotzerlab/freud/issues/1269 - (fetchpatch { - url = "https://github.com/glotzerlab/freud/commit/8f636e3815737945e45da5b9996b5f69df07c9a5.patch"; - hash = "sha256-PLorRrYj16oBWHYzXDq62kECzVTtyr+1Z20DJqTkXxg="; - }) - ]; - # Because we prefer to not `leaveDotGit`, we need to fool upstream into # thinking we left the .git files in the submodules, so cmake won't think we # didn't initialize them. Upstream doesn't support using the system wide @@ -51,20 +53,27 @@ buildPythonPackage rec { touch extern/{voro++,fsph,Eigen}/.git ''; - nativeBuildInputs = [ - cmake + build-system = [ + scikit-build-core cython oldest-supported-numpy - scikit-build - setuptools + ]; + + nativeBuildInputs = [ + cmake + ninja ]; dontUseCmakeConfigure = true; - buildInputs = [ tbb ]; + buildInputs = [ + tbb_2022 + nanobind + ]; - propagatedBuildInputs = [ + dependencies = [ numpy rowan scipy + parsnip ]; nativeCheckInputs = [ @@ -73,14 +82,6 @@ buildPythonPackage rec { matplotlib sympy ]; - disabledTests = [ - # https://github.com/glotzerlab/freud/issues/961 - # - # For x86_64-linux, see: - # - # https://github.com/glotzerlab/freud/issues/961#issuecomment-2553344968 - "test_docstring" - ]; # On top of cd $out due to https://github.com/NixOS/nixpkgs/issues/255262 , # we need to also copy the tests because otherwise pytest won't find them. preCheck = '' diff --git a/pkgs/development/python-modules/html2pdf4doc/default.nix b/pkgs/development/python-modules/html2pdf4doc/default.nix index 6e59066f3e4d..6f0e02d41fdd 100644 --- a/pkgs/development/python-modules/html2pdf4doc/default.nix +++ b/pkgs/development/python-modules/html2pdf4doc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "html2pdf4doc"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; src = fetchFromGitHub { owner = "mettta"; repo = "html2pdf4doc_python"; tag = version; - hash = "sha256-VFNM66NbApB6qrmK5j0MaqkD4Riwzo7Cy6XjPW6/4lc="; + hash = "sha256-cYKbnMVsENA17VsNXjV/funmBPbbrwA6enpIxOZ2sbQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/j2lint/default.nix b/pkgs/development/python-modules/j2lint/default.nix new file mode 100644 index 000000000000..c51312dc24c0 --- /dev/null +++ b/pkgs/development/python-modules/j2lint/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + jinja2, + setuptools, + fetchFromGitHub, + rich, + versionCheckHook, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "j2lint"; + version = "1.2.0"; + pyproject = true; + src = fetchFromGitHub { + owner = "aristanetworks"; + repo = "j2lint"; + rev = "v${version}"; + hash = "sha256-/3hd2RnyxX4CsqWvsmGB/5QoeQIsFhtG3nntHer0or8="; + }; + + build-system = [ setuptools ]; + dependencies = [ + jinja2 + rich + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = with lib; { + homepage = "https://github.com/aristanetworks/j2lint"; + description = "Jinja2 Linter CLI"; + license = licenses.mit; + maintainers = with maintainers; [ polyfloyd ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 763e473267e3..d331a852ca61 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.9"; + version = "0.3.11"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-dMGvGZyux38Svl0OYgiAoYLdAf0lv27lzXgHFTBp3cs="; + hash = "sha256-SShVzssXi18j5gcDSwwDT+umObEk7uhaCP2mMolQJxI="; }; sourceRoot = "${src.name}/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index bfe9f549af95..1fc1067db2e4 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.2.4"; + version = "0.2.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-CBX9tDYDrLCe/q+QS6ze4B6E5dVJhfsd6QB4U6kObTM="; + hash = "sha256-UEVhzKDu2nMkhaCLD162xCBR+2e3ipSVakmlZAzhN3Q="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index b1f19401b812..569d6c6902f1 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -134,6 +134,6 @@ buildPythonPackage rec { homepage = "https://github.com/librosa/librosa"; changelog = "https://github.com/librosa/librosa/releases/tag/${version}"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ GuillaumeDesforges ]; + maintainers = with lib.maintainers; [ carlthome ]; }; } diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 16d821e901c8..32183a5b415d 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-qgrHlJXOKWY5UnB2lZAJun3xA9sxn5+ZNNI6+aDnE98="; + hash = "sha256-fprFX75y50RzJA4SlMfgAeXOO88QbY9UT17Y8oIwdUk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix index 47794ed6c12a..315627c2a88e 100644 --- a/pkgs/development/python-modules/llm-ollama/default.nix +++ b/pkgs/development/python-modules/llm-ollama/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "llm-ollama"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "taketwo"; repo = "llm-ollama"; tag = version; - hash = "sha256-mWiwUXLpyILH1CCi2b0D3TtInEIfK4dubho9EEkbJ0M="; + hash = "sha256-8ELjUpHaIC8BOcmyQNeyQDPxQ5vO4Pj6FFnHFhvP+r0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index a97f71dad212..5d604682a826 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -26,16 +26,15 @@ buildPythonPackage rec { buildInputs = [ lmdb ]; + nativeBuildInputs = [ cffi ]; + env.LMDB_FORCE_SYSTEM = 1; dependencies = [ patch-ng ]; pythonImportsCheck = [ "lmdb" ]; - nativeCheckInputs = [ - cffi - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Universal Python binding for the LMDB 'Lightning' Database"; diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix index fffe7059cbfc..ff25bba8b1f1 100644 --- a/pkgs/development/python-modules/markitdown/default.nix +++ b/pkgs/development/python-modules/markitdown/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "markitdown"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "markitdown"; tag = "v${version}"; - hash = "sha256-7T5cuFBivazKlUk3OKXKKU3YazRAfGRt9O+gCYX3ciQ="; + hash = "sha256-bHnJsv4ln1W0lVbWwLmCzQ15KOGJZ9gF2yx4TDuBqBI="; }; sourceRoot = "${src.name}/packages/markitdown"; diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index c71ceacfacda..b3065d6f1e5f 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.18.1"; + version = "2.18.4"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-hQ1it/hiTsLAQa5OLWf5tZsZFG6p/TX8Z6+jGZxSTfg="; + hash = "sha256-ijgdilia8WVwAZ0BDxvrN751ReJu6iaIW9KbIrXdwUE="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index 9672de42338d..88523d744a7e 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "mkdocs-awesome-nav"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasgeiter"; repo = "mkdocs-awesome-nav"; tag = "v${version}"; - hash = "sha256-F52LG5kdrZvQbVhV++0SwRYKLg6kgBY4ycomfr/bG/0="; + hash = "sha256-JeVOJl26ooAZ2xbmyOqSKRa/5Dbu5BXov3ZS6sXgnnU="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index bb54c00ca92f..d642f8b19e1c 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-RnEkYdQP2VGYNpcQuwJoC1QenppJj+lFtHiPIUNfRnY="; + hash = "sha256-WCep7ibi1iN8v8508ZkEPjW9zqK7mUaiGuWv2wnoiRI="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/mplcursors/default.nix b/pkgs/development/python-modules/mplcursors/default.nix index 1a1c2dda4c4a..1fc443d9f9fc 100644 --- a/pkgs/development/python-modules/mplcursors/default.nix +++ b/pkgs/development/python-modules/mplcursors/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mplcursors"; - version = "0.6"; + version = "0.7"; pyproject = true; src = fetchFromGitHub { owner = "anntzer"; repo = "mplcursors"; rev = "v${version}"; - hash = "sha256-L5pJqRpgPRQEsRDoP10+Pi8uzH5TQNBuGRx7hIL1x7s="; + hash = "sha256-bHBMi9xtawV50xPyR1vsGg+1KmTWjeErP9yh2tZxTIg="; }; build-system = [ diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 9dd5b5b31266..c73a68a1f5a1 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.19"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ncclient"; repo = "ncclient"; tag = "v${version}"; - hash = "sha256-ZAZMazf1PB54MbHyhSuSpg0IWSSqinE2DvHD+L8GKu8="; + hash = "sha256-GSa7UkBwbwggFqwNFTg2KNqGV5412EE41ma/dzPIEuU="; }; build-system = [ diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix index 802c03563237..d4065f175cb2 100644 --- a/pkgs/development/python-modules/netbox-dns/default.nix +++ b/pkgs/development/python-modules/netbox-dns/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "netbox-plugin-dns"; - version = "1.3.5"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "peteeckel"; repo = "netbox-plugin-dns"; tag = version; - hash = "sha256-7Ej+YDpV/irXUujDsgNnhpFdKduT/ALXvjQjyb9PLOA="; + hash = "sha256-W9idValK33+FIzp90pj1+aospTyPMxzCp4bpOpYrNls="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index d5365439945c..5ee380a8c820 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -64,10 +64,6 @@ buildPythonPackage rec { --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' substituteInPlace okonomiyaki/platforms/_platform.py \ --replace-fail 'name.split()[0]' '(name.split() or [""])[0]' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ - --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' ''; pythonImportsCheck = [ "okonomiyaki" ]; diff --git a/pkgs/development/python-modules/parsnip/default.nix b/pkgs/development/python-modules/parsnip/default.nix new file mode 100644 index 000000000000..e9dcf670fbeb --- /dev/null +++ b/pkgs/development/python-modules/parsnip/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + more-itertools, + numpy, +}: + +buildPythonPackage rec { + pname = "parsnip"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "glotzerlab"; + repo = "parsnip"; + rev = "v${version}"; + hash = "sha256-Nac0afep7+HkpSBpqClHpPFSc8H3g8l4q067RQe5K54="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + more-itertools + numpy + ]; + + pythonImportsCheck = [ + "parsnip" + ]; + + meta = { + description = "Lightweight, performant library for parsing CIF files in Python"; + homepage = "https://github.com/glotzerlab/parsnip"; + changelog = "https://github.com/glotzerlab/parsnip/blob/${src.rev}/changelog.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index dca63eba3497..afb29a24bb1c 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "piccata"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = "piccata"; tag = version; - hash = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; + hash = "sha256-wdfujQ8QYHZGFsnI0fQRSEI6sOCsDXj2FX0ZII5zmtA="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index 44688b331958..45ccbffb456d 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pint-pandas"; - version = "0.6"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hgrecco"; repo = "pint-pandas"; tag = version; - hash = "sha256-5/Qk6HZlfeKkfSqnVA8aADjJ99SUiurYCqSIUBPFIzc="; + hash = "sha256-B8nxGetnYpA+Nuhe//D8n+5g7rPO90Mm1iWswJ0+mPc="; }; build-system = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 5d4928938c26..ca894ac55f06 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independent of pulumi's. - version = "7.2.0"; + version = "7.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; tag = "v${version}"; - hash = "sha256-fYcApSVMBSlw9YMf1J5PRma8GXPCGKDpnPd1BXJh5EE="; + hash = "sha256-GLtl9799lQv+Wus/rvUOd/FkRaja7tJddD8ffIhCCdo="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pycsdr/default.nix b/pkgs/development/python-modules/pycsdr/default.nix index cdac5ed055c1..3422e1a87a07 100644 --- a/pkgs/development/python-modules/pycsdr/default.nix +++ b/pkgs/development/python-modules/pycsdr/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pycsdr"; - version = "0.18.0"; + version = "0.18.2"; format = "setuptools"; src = fetchFromGitHub { owner = "jketterl"; repo = "pycsdr"; rev = version; - hash = "sha256-OyfcXCcbvOOhBUkbAba3ayPzpH5z2nJWHbR6GcrCMy8="; + hash = "sha256-OzkH1L9bFXf+kK8OPjRXpGz+fPCs67spJfXyV28NWWQ="; }; propagatedBuildInputs = [ csdr ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 153c6d9368ac..8eb6814b4ba3 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.96"; + version = "0.2.97"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-5STYqx0D6X6h6tJFCCrYVx3oYqlZwvmiuTrVLXsXWLM="; + hash = "sha256-w9OrwJjS4KoGc/o8YzYklNQbHliDV7KlayJRM5e6itc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index 38777b3b88ba..d99fca0cfb90 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygithub"; - version = "2.7.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; tag = "v${version}"; - hash = "sha256-meWuetrgE2ks3BEQedrvrfYEVAJsFGgYO6GXPRUcJv4="; + hash = "sha256-36taxa95WrpQw0UUlmnWX4XFslAAuuoousxNh5O5uDA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyhomee/default.nix b/pkgs/development/python-modules/pyhomee/default.nix index fba7bb83d474..1a43cfdedbab 100644 --- a/pkgs/development/python-modules/pyhomee/default.nix +++ b/pkgs/development/python-modules/pyhomee/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyhomee"; - version = "1.2.10"; + version = "1.3.8"; pyproject = true; src = fetchFromGitHub { owner = "Taraman17"; repo = "pyHomee"; tag = "v${version}"; - hash = "sha256-pfWDVvEm/YXU83gSCLaU5/C5qwxJH3NFm0jpahpgMx4="; + hash = "sha256-7Op+l6gIyPPE4DX3XGi1hpgWRllOTbaqqUuop7JDMhY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 04e510966069..b6a51e7d29c5 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.35.0"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-TVcSgns+K26CgplSJ4SVlIattG3eDRdg9b2pFKGZGDM="; + hash = "sha256-/1ijyVl5CFwOXwo2Jki4o6fJ+Bf4kkDFfJT0+BO5Jhg="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +51,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-riAUasZV6yFW9yPoVojH8/zYKV1xlckTVrLzdUZgoDM="; + hash = "sha256-VuPnzeM9m3HYV6pEt5n7KSBtS5L4zHiK38tqND2sPHk="; }; nativeBuildInputs = [ @@ -113,6 +113,7 @@ buildPythonPackage rec { # subprocess.CalledProcessError: Command ... returned non-zero exit status 1. # ModuleNotFoundError: No module named 'lance' + "test_timestamp_precision" "test_tracing" # Flaky (AssertionError) diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index 269743e7fd94..f956ec3f8b20 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "stac-utils"; repo = "pystac"; tag = "v${version}"; - hash = "sha256-DxRJsnbzXBnpQSJE0VwkXV3vyH6WffiMaZ3119XBxJ8="; + hash = "sha256-gYyoVgJIXhT26a57kQfMT5bV+eUNZiNE8FEPpNrJeNM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 5ac0fdc37f87..a251f89fc5de 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -3,8 +3,10 @@ buildPythonPackage, callPackage, fetchFromGitHub, + pythonOlder, pytest, setuptools-scm, + backports-asyncio-runner, }: buildPythonPackage rec { @@ -27,6 +29,9 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; + dependencies = lib.optionals (pythonOlder "3.11") [ + backports-asyncio-runner + ]; postInstall = '' mkdir $testout diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix index 1b87fe41f48b..22b1b940ceb5 100644 --- a/pkgs/development/python-modules/python-troveclient/default.nix +++ b/pkgs/development/python-modules/python-troveclient/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-troveclient"; - version = "8.8.0"; + version = "8.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-troveclient"; tag = version; - hash = "sha256-WBMXSZhkrKlEkVpy56zdBRzspUjUsj0dQ4OR250Fo+s="; + hash = "sha256-iyCI/0He2vG6VNBCQ9sbQoUYkgn6ciWrnfACQDKuJ6M="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix index 38f10c885182..f632fcceaae3 100644 --- a/pkgs/development/python-modules/qtile-bonsai/default.nix +++ b/pkgs/development/python-modules/qtile-bonsai/default.nix @@ -4,34 +4,31 @@ fetchFromGitHub, cairocffi, cffi, - strenum, psutil, xcffib, - pdm-backend, + uv-build, pyside6, pyvirtualdisplay, pytestCheckHook, qtile, }: - buildPythonPackage rec { pname = "qtile-bonsai"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "aravinda0"; repo = "qtile-bonsai"; tag = "v${version}"; - hash = "sha256-1wiBrLQDdQGsoZAT5XUzmuloVo90y+GZu1bqPrbQl48="; + hash = "sha256-JCElI4Ymr99p9dj++N9lyTFNmikntBwwImYREXFsUo0="; }; build-system = [ - pdm-backend + uv-build ]; dependencies = [ - strenum psutil ]; @@ -45,6 +42,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'uv_build>=0.8.13,<0.9.0' 'uv_build' + ''; + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 954fca4a4e2b..8cd13c3e51ab 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "reuse"; - version = "5.0.2"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; tag = "v${version}"; - hash = "sha256-MzI3AY5WLNyCLJZM7Q5wUH3ttx+FHPlSgAfngzOgzec="; + hash = "sha256-xrYr68PpTLglTlLgTHWHJjTd62tzcOvY9h//CxYJOzM="; }; outputs = [ diff --git a/pkgs/development/python-modules/rowan/default.nix b/pkgs/development/python-modules/rowan/default.nix index 84b872d871a7..003582e9ea8b 100644 --- a/pkgs/development/python-modules/rowan/default.nix +++ b/pkgs/development/python-modules/rowan/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rowan"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "rowan"; rev = "v${version}"; - hash = "sha256-klIqyX04w1xYmYtAbLF5jwpcJ83oKOaENboxyCL70EY="; + hash = "sha256-fcxVpzLhbLjPIifNBx0olq1dUTmNM9IH38MQybkWZSg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index d0eeb585c727..4646eb623c56 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rtree"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "rtree"; tag = version; - hash = "sha256-swFvo57EUy69OInJNQzOzhjmfEIGL0aJSvYhzcmSzSs="; + hash = "sha256-ilhHBAYa4GaKUt8CmmJRS569D9INHZmWS6lK/+AIiqY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index 3d188c8aa78a..6c8d28ea2a4f 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "scipp"; - version = "25.05.1"; + version = "25.08.0"; pyproject = true; src = fetchFromGitHub { @@ -47,7 +47,7 @@ buildPythonPackage rec { repo = "Scipp"; # https://github.com/scipp/scipp/pull/3722 tag = version; - hash = "sha256-AanXb+nF/YIZFuzG5UnoNPX97WScfPKuoSBY18uYt9k="; + hash = "sha256-s3whsNYqS7hsqvWX73E8KbDMUZTGWLgeqmN08tXPkwE="; }; env = { SKIP_CONAN = "true"; diff --git a/pkgs/development/python-modules/surt/default.nix b/pkgs/development/python-modules/surt/default.nix index 57b89aa0795e..b4b3bb2d444f 100644 --- a/pkgs/development/python-modules/surt/default.nix +++ b/pkgs/development/python-modules/surt/default.nix @@ -19,6 +19,7 @@ buildPythonPackage { owner = "internetarchive"; repo = "surt"; # Has no git tag, https://github.com/internetarchive/surt/issues/26 + # nixpkgs-update: no auto update rev = "6934c321b3e2f66af9c001d882475949f00570c5"; hash = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4="; }; diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index 19f994b86ffe..c561a587b261 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "swh-core"; - version = "4.0.0"; + version = "4.5.2"; pyproject = true; src = fetchFromGitLab { @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "devel"; repo = "swh-core"; tag = "v${version}"; - hash = "sha256-kO4B25+oQrQ9sxmKJ5NMKTCCGztRaArFtD7QA8Bytts="; + hash = "sha256-yNWij9GclQCysQe9Bukr4cHlZgSQqLAuX1KwGWzAK+0="; }; build-system = [ diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index 8e6f8fa45df6..3d53e0c096fd 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.13.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "thermopro-ble"; tag = "v${version}"; - hash = "sha256-FgobrgMA+YbmI5VxdzCgYipSLGRK6+uIOTMy9P4Aeos="; + hash = "sha256-AlMwpDUFNz98KZRLi9TVqZ9sPXdLcVCvvVa0PXlv4q4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index db55452952ce..ca51b35a3d78 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "24.8.0"; + version = "25.8.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ATQj7n7tECsvOTwofSLZX2bxo+oQpLqoLSmAAafxivM="; + hash = "sha256-7vFtKfgxrVers64yoFZXOYZiGfHr+90pfTKJTrmUDrE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 2564a7597fce..d673a96face7 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -78,12 +78,12 @@ }: let - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "wandb"; repo = "wandb"; tag = "v${version}"; - hash = "sha256-GJk+Q/PY3/jo/yeetYRgqgMdXdYSlGt7Ny1NqdfHF0Q="; + hash = "sha256-1l68nU/rmYg/Npg1EVraGr2tu/lkNAo9M7Q0IyckEoc="; }; gpu-stats = rustPlatform.buildRustPackage { diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix index 9aae527a124d..dca5c8318006 100644 --- a/pkgs/development/python-modules/x-transformers/default.nix +++ b/pkgs/development/python-modules/x-transformers/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "x-transformers"; - version = "2.6.1"; + version = "2.7.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "x-transformers"; tag = version; - hash = "sha256-UDZBN/k1VDnfxv1t4EpvXJ6rfC0XgGCWSFBaCGN43E0="; + hash = "sha256-H9g4LlNzZLM+RBNBvapwvVrYMF9XYHpnT5wfMspXCfE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index fbcc080390ae..a2fcbc5ebebe 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.1.5"; + version = "6.1.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rocky"; repo = "python-xdis"; tag = version; - hash = "sha256-KbWgA2RGmkzpsPBg2+hcpwHUCgEv7RWS3i5sswtROVE="; + hash = "sha256-G4BpvMYjBUBfStP1csfFaFCin0eYEnXwsztCS4amvdY="; }; build-system = [ diff --git a/pkgs/development/tools/zls/deps_0_15.nix b/pkgs/development/tools/zls/deps_0_15.nix index 2292e4212b6c..5e3f28ccc47a 100644 --- a/pkgs/development/tools/zls/deps_0_15.nix +++ b/pkgs/development/tools/zls/deps_0_15.nix @@ -1,4 +1,5 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) +# manually removed tracy as instructed here: https://github.com/zigtools/zls/blob/ce6c8f02c78e622421cfc2405c67c5222819ec03/build.zig.zon#L9-L13 { linkFarm, fetchzip }: @@ -10,13 +11,6 @@ linkFarm "zig-packages" [ hash = "sha256-y7Ck5XZNnHxmPPWlDAqZZ2g3n67txj5/Zq04AhuW5+M="; }; } - { - name = "N-V-__8AAMeOlQEipHjcyu0TCftdAi9AQe7EXUDJOoVe0k-t"; - path = fetchzip { - url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.11.1.tar.gz"; - hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8="; - }; - } { name = "known_folders-0.0.0-Fy-PJkfRAAAVdptXWXBspIIC7EkVgLgWozU5zIk5Zgcy"; path = fetchzip { diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index 5741e8d2c2aa..c8a15981ff85 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -17,25 +17,25 @@ let sfl-src = fetchFromGitHub { owner = "slavenf"; repo = "sfl-library"; - tag = "1.9.0"; - hash = "sha256-Udry/Y753l274PU6RvpPgkIr85wSCnz3mLQ0xzerUAc="; + tag = "1.9.2"; + hash = "sha256-/3++CtSuZJ5Sdg8U8mJ/gT+FTatKhBx8QeYjUVQCDWA="; }; openloco-objects = fetchurl { - url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.1/objects.zip"; - sha256 = "e75ad13a8e8d58458e0c54e5ce62902a073d7bb025ef8fb97cb56108ff7c57c3"; + url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.3/objects.zip"; + sha256 = "c08937691b9d7a956305864b535c6e4537a84b81a9dc5d4c9016edff83dcceb6"; }; in stdenv.mkDerivation rec { pname = "openloco"; - version = "25.02"; + version = "25.08"; src = fetchFromGitHub { owner = "OpenLoco"; repo = "OpenLoco"; tag = "v${version}"; - hash = "sha256-RsiEYBNx+Lf7OyyyCShQmgtwBuxDrZkRCYCbMmZ8ZMM="; + hash = "sha256-f4GZxLibQM/od0tJoszaG94FkRH5vb9qwQ7OqVdt1cU="; }; postPatch = '' diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index dde457a38c51..13fd738bd54f 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -7,13 +7,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.65.4"; + version = "0.66.0"; src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-A0bcfbihbGbOCmCI3NXHUWL4w2l46dGDWKy6tVIsuc8="; + hash = "sha256-FMAEF7DiHP5HqGTOdwB9UGA/5Hbp1XIEVD98G7PR4AA="; }; patches = [ ]; diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 4ebf185b40a5..83acf6a73c42 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/attica-6.17.0.tar.xz", - "hash": "sha256-L6tKLTLpj2JGW4G9puQW/3+pnWqklMSyYfh3J1j2txo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/attica-6.18.0.tar.xz", + "hash": "sha256-6ysr4zzINRLHevJVn8r3/FitGRq7gs9AsXsunoQA4zY=" }, "baloo": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/baloo-6.17.0.tar.xz", - "hash": "sha256-IarD6V6gld8Cm74L1WY6o5ioiU6cMep/q7XNC5hIVEo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/baloo-6.18.0.tar.xz", + "hash": "sha256-aAsB7Xx4m37w7o8U+v+vLovfh6VqJusqb5WkcuVjCQM=" }, "bluez-qt": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/bluez-qt-6.17.0.tar.xz", - "hash": "sha256-c25rDDFYl8XqhEVE/u71L9HplI7E/yTyxSxf1xig5l0=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/bluez-qt-6.18.0.tar.xz", + "hash": "sha256-k0CEkHWnqj/p8h4tK4OJYsCuhO36FqS0zxf0AiMFzrM=" }, "breeze-icons": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/breeze-icons-6.17.0.tar.xz", - "hash": "sha256-T/x1iG6aFKKgLaSHFgC4wLWkB1a46Zy+z7UVaW2Tw7g=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/breeze-icons-6.18.0.tar.xz", + "hash": "sha256-R5bE7mBZp3etjZVKRYToH99QR6lKeYj8N0BSxCe8C2A=" }, "extra-cmake-modules": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/extra-cmake-modules-6.17.0.tar.xz", - "hash": "sha256-3+yxfQI49N4d00hbkqZgYTfUqcZ7nkzkBAf+DyrsCkA=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/extra-cmake-modules-6.18.0.tar.xz", + "hash": "sha256-stIiLP5azlAsYL2Kd6ebwCMPSM7oMmXIncwmGLlg4pM=" }, "frameworkintegration": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/frameworkintegration-6.17.0.tar.xz", - "hash": "sha256-nZ4BH6ydmWfZTEPtKiE9hRJjgF4dtdrQjYEv4/DmrRI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/frameworkintegration-6.18.0.tar.xz", + "hash": "sha256-zFM2+O0Z2gYfdm1IVNdunNQkrECCy0TftOfPE2rqtFQ=" }, "kapidox": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kapidox-6.17.0.tar.xz", - "hash": "sha256-p6PCwgnPX4EK9IJko2HlJtuskfF5wsAgj6AtxBb58NI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kapidox-6.18.0.tar.xz", + "hash": "sha256-2184y3MtbUutE0jiz3iS6MepAYurAMha3WMVB/S4Z38=" }, "karchive": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/karchive-6.17.0.tar.xz", - "hash": "sha256-YGR8JGRqQ/Z96vN+ICRt+dN5+j91E/6FNqHfozCGW0A=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/karchive-6.18.0.tar.xz", + "hash": "sha256-+iT3A6p5nk/1ucwuSmKHRZEuv8yfDGu22SEG/54C4m8=" }, "kauth": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kauth-6.17.0.tar.xz", - "hash": "sha256-pWPMqqYVwfHb30tFrR2ic55A/ZSQvFkGr9WrXa41+TI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kauth-6.18.0.tar.xz", + "hash": "sha256-jG/uaUguej389+rMqctqGR7F0bCeClOeH31ddtCEA+k=" }, "kbookmarks": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kbookmarks-6.17.0.tar.xz", - "hash": "sha256-BBuWZ9PUhRsOb6Yqn8ESqZOKSHtMpSDu3eG1NWNiF/I=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kbookmarks-6.18.0.tar.xz", + "hash": "sha256-QahF/9nv+42ULQTXb8OliwvyPT/TauuiHImrnrD8T4U=" }, "kcalendarcore": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcalendarcore-6.17.0.tar.xz", - "hash": "sha256-SgZ1xiEcrxg6BnGUskCT3GMBWhpZvge4ZM9F96zRjhM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcalendarcore-6.18.0.tar.xz", + "hash": "sha256-TSMwrzXVbFnuafCPOEW6vumJbQABK8z7sUO9xXG8WOc=" }, "kcmutils": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcmutils-6.17.0.tar.xz", - "hash": "sha256-j2XvD09PMlrW4qMMsUJCIg+BGrHgMUFv0/qlRKxoPoo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcmutils-6.18.0.tar.xz", + "hash": "sha256-YRTB7I63NzRhmpnklW3ORJgorzNsLNkdGb/rA+IhUo8=" }, "kcodecs": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcodecs-6.17.0.tar.xz", - "hash": "sha256-B7HG9sMJFWKamTRvn9WoVK/jZykZEfthAAkyd39+mPI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcodecs-6.18.0.tar.xz", + "hash": "sha256-JH7amt5QJpkGLHuqynu5NpGjCPICwWWVRlKHXr53dCY=" }, "kcolorscheme": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcolorscheme-6.17.0.tar.xz", - "hash": "sha256-yL1F6ySPw42Bbk6w/ZSdkJwJo6WpCEjvbUBAw1lz97Q=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcolorscheme-6.18.0.tar.xz", + "hash": "sha256-FOmedMxjZkCsjXBfKHjXLQN5//Zx51wPE4MCSJiY1lE=" }, "kcompletion": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcompletion-6.17.0.tar.xz", - "hash": "sha256-8i5Mb6zsgSveSrjVagWziiQ92TYsjetPE2fvsbbmRmM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcompletion-6.18.0.tar.xz", + "hash": "sha256-bQaIH/Ls5MKd9cPL43AMteNCUGRoamZ+hPBvKlcyocU=" }, "kconfig": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kconfig-6.17.0.tar.xz", - "hash": "sha256-BnQ1skyp989WqM5bEIQ4oVYHsm3FKQWuB9wYfH4pSd4=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kconfig-6.18.0.tar.xz", + "hash": "sha256-UXy/Z0ffkonW/Ohgpz1J5ZNUaFM0rkaOzVPxBn2dYYs=" }, "kconfigwidgets": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kconfigwidgets-6.17.0.tar.xz", - "hash": "sha256-C8U2bTjcvhKuoyqoTnfpwnjTxjru1vUJr1KEijCkHiE=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kconfigwidgets-6.18.0.tar.xz", + "hash": "sha256-qlp75ieKGXM/d+akNfhMPnGSayjxrDdmMTd4iQ1kCBM=" }, "kcontacts": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcontacts-6.17.0.tar.xz", - "hash": "sha256-GY2yW9x+f+4Rdm7/7ROtRDj2ohG+ihahzR6BXj688ho=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcontacts-6.18.0.tar.xz", + "hash": "sha256-pTLEfDwsgYKyrp54P/UhMRiWJRwqHdvjZLNJH5TBALY=" }, "kcoreaddons": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcoreaddons-6.17.0.tar.xz", - "hash": "sha256-AwPW0ennbPnsBqQazRpSCIpA3zooBel+HDJ7r2B4Qqo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcoreaddons-6.18.0.tar.xz", + "hash": "sha256-4dA8/H1FmH7DHzEQT0cygSmA4AOL6rIiYz2hEI629C8=" }, "kcrash": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kcrash-6.17.0.tar.xz", - "hash": "sha256-UvS93GQuaOlvjxizS7qAO4+fk8uM9eHRqrzP08UoXhM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kcrash-6.18.0.tar.xz", + "hash": "sha256-pmKTghsVH1dfz7WYSFeHSeJIxbqi8mKshnJdD2SzJOA=" }, "kdav": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdav-6.17.0.tar.xz", - "hash": "sha256-jYo7A8XFP1iiZgtYm4lzHRgro7xiLHbge/5sv1Cmk8c=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdav-6.18.0.tar.xz", + "hash": "sha256-w/BI18qfCUZHu2h/HqIYugC/OrOwej0au8KdrWd8VSY=" }, "kdbusaddons": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdbusaddons-6.17.0.tar.xz", - "hash": "sha256-V9ZAv6EcFmC13NPBxx1gWkBULRZX4E2b+Ge3Yb/ncvQ=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdbusaddons-6.18.0.tar.xz", + "hash": "sha256-3Olc0Ubhi0AMTfMeqMm7uo+RnjKaUtwaGWNRhKyF5Jo=" }, "kdeclarative": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdeclarative-6.17.0.tar.xz", - "hash": "sha256-tTY9/HNU0foe1J1xdaAzSo72boK7OJukuv/m93jy4ro=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdeclarative-6.18.0.tar.xz", + "hash": "sha256-3EKnTGQoHmeY0HzZ7VMm9vPYIkfy4p58qYVaNss6Hmw=" }, "kded": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kded-6.17.0.tar.xz", - "hash": "sha256-T18EudvPOgukKBVBnZabAaZiQCTRSZTVQKlzpjcc8nc=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kded-6.18.0.tar.xz", + "hash": "sha256-yQ4+5r+ZHzIKxCiywSavv+ETCnTu5nJAWBBYgwcuWII=" }, "kdesu": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdesu-6.17.0.tar.xz", - "hash": "sha256-ZmiZrVRre9AC4/wWlwMviSDOcmHfLvUZ6B1KrpGXESM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdesu-6.18.0.tar.xz", + "hash": "sha256-MgOwRxE88IvKOYHt5lfkW0F6fNDyh5u0+ekBrU5ZRhY=" }, "kdnssd": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdnssd-6.17.0.tar.xz", - "hash": "sha256-bhaBoBpM0JZQuk3hu61OwD0/ZFL8B/9PdOJLJAQPPgo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdnssd-6.18.0.tar.xz", + "hash": "sha256-xI8ogdlmTA7hK3CRxWy7HpWafpYM8tUsbIfm/KrxPH8=" }, "kdoctools": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kdoctools-6.17.0.tar.xz", - "hash": "sha256-J7DssCMieDcQPj+mrePeCqTV9W9PbJeplv5u50vonS8=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kdoctools-6.18.0.tar.xz", + "hash": "sha256-5z3bLfsbBh4C03hh71jC1Y2vGBfhzlQ3N/96vyhLyYQ=" }, "kfilemetadata": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kfilemetadata-6.17.0.tar.xz", - "hash": "sha256-K7mpmEarD3NjbsNPuiRJCKEjWR9/dFi6uRuM+yOSMEQ=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kfilemetadata-6.18.0.tar.xz", + "hash": "sha256-BcSwlViFtG/tbcI5mHYP2uWVmalgFZ7ET3eddJigiDQ=" }, "kglobalaccel": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kglobalaccel-6.17.0.tar.xz", - "hash": "sha256-/D1AVVQmORRbPkUGgmR0XGEfw+zw0BROqjUyA4+pcfE=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kglobalaccel-6.18.0.tar.xz", + "hash": "sha256-y5p7DukzZWIHlY+ylb8U+/vIKNXZaPYB/SitaHf9tDg=" }, "kguiaddons": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kguiaddons-6.17.0.tar.xz", - "hash": "sha256-XQfbyOJKsQd951t4MKHzYt/zcQ+wQdYbjaAsV3BWq2s=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kguiaddons-6.18.0.tar.xz", + "hash": "sha256-LiuHKALRsnsYVRL/qYlZBueqNDjL8TeEbM/4IWu+xGY=" }, "kholidays": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kholidays-6.17.0.tar.xz", - "hash": "sha256-W459+Ie/eQ7d1lM5EO76mwCnfyZ1Jg2nHza5XLdk+rI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kholidays-6.18.0.tar.xz", + "hash": "sha256-SdyJLZjuSTppbdcw9aDhYktGyn10aih38FcAer6fIVE=" }, "ki18n": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/ki18n-6.17.0.tar.xz", - "hash": "sha256-UPhn2UjBWq2Rw8V/4vZGLNvziB+rb9mbhbFWFvBzmD4=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/ki18n-6.18.0.tar.xz", + "hash": "sha256-0Mv780J8A2jaoj+faLPLWwOtN7aCBZFJGz6ooKKL6mE=" }, "kiconthemes": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kiconthemes-6.17.0.tar.xz", - "hash": "sha256-XPCyBijTAER3cMSrAO2yJezIVWF5KSPsAIP5vJ4LQkc=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kiconthemes-6.18.0.tar.xz", + "hash": "sha256-uXFGCUn6/Jjnrik/NWNcL9YQGm/Eay9PzmS7IUQOzgQ=" }, "kidletime": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kidletime-6.17.0.tar.xz", - "hash": "sha256-H2fSZ0nenwn0qw3Esj5T7LhNkhsdUtYSgi/cU8NMOzc=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kidletime-6.18.0.tar.xz", + "hash": "sha256-RK/IhUOyPFGetfVefFEgzNbU6y6qpb7iTj+15KaV2rc=" }, "kimageformats": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kimageformats-6.17.0.tar.xz", - "hash": "sha256-GAtnD3ZrrnQDQOWv0gROoIJC6pNUWbuVvIAxPQYgZqg=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kimageformats-6.18.0.tar.xz", + "hash": "sha256-nTc+9TYqqNcVQc7CiVQVyVypFGJtyw3WsM7vSR3LrkY=" }, "kio": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kio-6.17.0.tar.xz", - "hash": "sha256-0A1JUhmPjp/0QzWzQHFGFeASSFftvWfElktQ4MkT1i0=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kio-6.18.0.tar.xz", + "hash": "sha256-qXrOwUB+HwDKdOY5ZOdgiCjUQxv+CuvpAQwpa7Y4e9o=" }, "kirigami": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kirigami-6.17.0.tar.xz", - "hash": "sha256-C3+3GaIx/+t/zETIupA+rRO0NYxBnV8LFVUtP8hO11s=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kirigami-6.18.0.tar.xz", + "hash": "sha256-4FdL9fUwp82Y4DQkmGgfQ3S+/xCOdCYgY7EF4cl3+GY=" }, "kitemmodels": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kitemmodels-6.17.0.tar.xz", - "hash": "sha256-uQBEF7XpuzMJQ0q5CBmIlZD2v6MtSmU4jQUt9DLAsWY=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kitemmodels-6.18.0.tar.xz", + "hash": "sha256-iHZTsVca0K/UuDatJFGkKwdlfQ7t4aJijpxpECziPeE=" }, "kitemviews": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kitemviews-6.17.0.tar.xz", - "hash": "sha256-MdHI/2Syju8hbmOkQ6zNxiHFP1HsI+ahN9nghil0L9E=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kitemviews-6.18.0.tar.xz", + "hash": "sha256-90wD4uw2cjjsOVsfJDiHiZnCvj4ptBtr1KPM0ERA4po=" }, "kjobwidgets": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kjobwidgets-6.17.0.tar.xz", - "hash": "sha256-DcVt4ZvON2m3jDTasTmViAFxgPKY3oQZ7aGQmkIRtiQ=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kjobwidgets-6.18.0.tar.xz", + "hash": "sha256-5zn/JUxPo0wN4Aqi2d7uE4E12ZzQtG712yU8GMArzpg=" }, "knewstuff": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/knewstuff-6.17.0.tar.xz", - "hash": "sha256-EFnLfNubqBcN6CoIxoM0kAB6FSpG5L2+JDBO7dwmPWY=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/knewstuff-6.18.0.tar.xz", + "hash": "sha256-fnIXNav34vb4wPQjJPiFvK0RFMMXrHm/q8cF+4AY26U=" }, "knotifications": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/knotifications-6.17.0.tar.xz", - "hash": "sha256-t4AcVGk15ggqctTH3QOHQHtqGQWriN6b3a82mo7KQUE=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/knotifications-6.18.0.tar.xz", + "hash": "sha256-WTywDJ4EAYR3uhRgMfbUb0B5xjfGpGYwVmcS2EK586g=" }, "knotifyconfig": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/knotifyconfig-6.17.0.tar.xz", - "hash": "sha256-5aCPeHL/uDb7/pcm64bBBOMK/FWZYTjZZXMfV5SYEmM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/knotifyconfig-6.18.0.tar.xz", + "hash": "sha256-moF/tOGDO+AUNwutxr2/Rk8aoE4FQBb8O8r9BToZrag=" }, "kpackage": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kpackage-6.17.0.tar.xz", - "hash": "sha256-eNIxoiM5SSLQKVfheReiCN4OmCJPIfwQ5TislxvbQqQ=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kpackage-6.18.0.tar.xz", + "hash": "sha256-G8LkO/IjncIOg2twh3Yx4QMFf7FKlGcpDHb6Rf8Chw4=" }, "kparts": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kparts-6.17.0.tar.xz", - "hash": "sha256-HmTUJs5HUBqP8brIwjZvDNFT5s1NRA6CfrABXZ44w+k=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kparts-6.18.0.tar.xz", + "hash": "sha256-hG5SLmr/KiGQZKUum67v37y+px2tsYELnFjLnEGCFgQ=" }, "kpeople": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kpeople-6.17.0.tar.xz", - "hash": "sha256-3Q7EubrtQKL5YM5JA73HkHP1UZaTkzFOOql8dfcw978=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kpeople-6.18.0.tar.xz", + "hash": "sha256-Cbop7+thLu9OVIFPH5Hi0HyJQubPLCMXbZ8wbWhUTSs=" }, "kplotting": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kplotting-6.17.0.tar.xz", - "hash": "sha256-ZlSWW2PQhXwxwhgX5WkxaEwy3d8DXoMWnKbqfWuaJkM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kplotting-6.18.0.tar.xz", + "hash": "sha256-yf25n9HHX1iOLxXvhDM/6t8yeoeMJDJOREk9A+WT68k=" }, "kpty": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kpty-6.17.0.tar.xz", - "hash": "sha256-lqcWh6jeC+zDSoFXVy0kQLqNS5dv1dCBMzHf2GuSqrs=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kpty-6.18.0.tar.xz", + "hash": "sha256-P4AGOPzA2+oIEJMKHy3s+muJS7AHMv+GRhgsff0qx20=" }, "kquickcharts": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kquickcharts-6.17.0.tar.xz", - "hash": "sha256-HiBqloTYgs4sFH5DY5LcPvbNp55Lwt31qgOY0uLdxaQ=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kquickcharts-6.18.0.tar.xz", + "hash": "sha256-lB6tN40C4FgbcGY5x89HQzmBj2zUjZGGRngvcbx/dMs=" }, "krunner": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/krunner-6.17.0.tar.xz", - "hash": "sha256-nUpcDHSwz6njXDHediYz3ewEOcUPpEvIW+woraAQaRI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/krunner-6.18.0.tar.xz", + "hash": "sha256-aaILTlVNh2PvSlKXjkYFa1mO+47FhKx75b8GyjGNtRw=" }, "kservice": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kservice-6.17.0.tar.xz", - "hash": "sha256-sBRpfqO6NZ9GpunPlQ17vXqc8J6Vs2cYw2tmBalCSu4=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kservice-6.18.0.tar.xz", + "hash": "sha256-0IrKdNzFTaKd0re8QE7Z5uxoisx3g5tLj7w3K16jULg=" }, "kstatusnotifieritem": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kstatusnotifieritem-6.17.0.tar.xz", - "hash": "sha256-Z4qb/IcAZtVBO7z6CaVrgrCv/SvCIs5XAdAqixKe3ZE=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kstatusnotifieritem-6.18.0.tar.xz", + "hash": "sha256-14qiDhhY9wBHjuzttJcUFg1eBLSg0Xe8pDVaoaD31zA=" }, "ksvg": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/ksvg-6.17.0.tar.xz", - "hash": "sha256-Nyjalmky8g8ZClRaf0Lt6i+b2+bXJ6W8G1V+9RVbf5Q=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/ksvg-6.18.0.tar.xz", + "hash": "sha256-DqsrpTKQa2Eq/uL7+oAqiNf0Vw1MMilyy23r0yAHXBA=" }, "ktexteditor": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/ktexteditor-6.17.0.tar.xz", - "hash": "sha256-mQTAxckzo2jW9JLZ4RbMziAQVNWgKbiw/gdZ/4frjKM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/ktexteditor-6.18.0.tar.xz", + "hash": "sha256-T4q7BDagxspQH3vjkZdXVssH+OQD06/n7C8C0Sv3tRY=" }, "ktexttemplate": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/ktexttemplate-6.17.0.tar.xz", - "hash": "sha256-FddZQdFerDzRJDBmsTow1sFFHKYwsMKbNiS+NK1z6XI=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/ktexttemplate-6.18.0.tar.xz", + "hash": "sha256-y7ZQXDWo7cDm/vt9JP3oJ17v3Jc1QHKXrOAqfEDzfgY=" }, "ktextwidgets": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/ktextwidgets-6.17.0.tar.xz", - "hash": "sha256-M9RuzdA/9oWC2lzvJRkhqMbnpdt62b/QQyywBxKsKeM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/ktextwidgets-6.18.0.tar.xz", + "hash": "sha256-mvsTaAbouVw0IR4drmbkzxTXqsKrJE1SZMqsToI9jt8=" }, "kunitconversion": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kunitconversion-6.17.0.tar.xz", - "hash": "sha256-8mJaS6JbMyn7lzAkkHO800m3o0Y2IUjH+peYnvx+XMo=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kunitconversion-6.18.0.tar.xz", + "hash": "sha256-I6Sl2ZRmb52ypaPCUQOPLvHZeEEZUJJXAvt5BgztMcg=" }, "kuserfeedback": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kuserfeedback-6.17.0.tar.xz", - "hash": "sha256-DxtTYf+m//Euw9/Xo+SxsqpuutxK/MA6nTHC1JvsfK8=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kuserfeedback-6.18.0.tar.xz", + "hash": "sha256-tiOrUaW2krGzhdlAy0wArgENzdjCotbiMVn/gVuPHlI=" }, "kwallet": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kwallet-6.17.0.tar.xz", - "hash": "sha256-RMr2kfR7okby77E/nI9xI8fmdF1CgVYCKLgVjMi5PX0=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kwallet-6.18.0.tar.xz", + "hash": "sha256-yGMOGygLmu5E8zZzAvzjgTcKYRVX8ZQZCLkobjiR0WM=" }, "kwidgetsaddons": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kwidgetsaddons-6.17.0.tar.xz", - "hash": "sha256-3LMzh5U80EKdQpfWKLSHLno6lwzOXqhLRGZ32LdIfqE=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kwidgetsaddons-6.18.0.tar.xz", + "hash": "sha256-DC+wB0T/2ey3Ux7lp5wdtLQGdT8lBWUSLzrdk88gCvs=" }, "kwindowsystem": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kwindowsystem-6.17.0.tar.xz", - "hash": "sha256-JZq+9YsJrRqAIrXLlIMamPPltcx8ZfegtAvmQ2F1b2M=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kwindowsystem-6.18.0.tar.xz", + "hash": "sha256-oKBGA5oRuuus2W2DbldluYFCb2DSzqn/mpm6jb5WF44=" }, "kxmlgui": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/kxmlgui-6.17.0.tar.xz", - "hash": "sha256-oYBxacosOGqNPiXLKwZlVOSWY6bj9jLxoZaO9UdkMOM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/kxmlgui-6.18.0.tar.xz", + "hash": "sha256-bV4kDINWaEGawDZmb6TJnjR5eVxpiBAHY/gQyog1xAE=" }, "modemmanager-qt": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/modemmanager-qt-6.17.0.tar.xz", - "hash": "sha256-tB/h3ZoOFGrbTYCY1WnWsRKR9AyQ33DfuqatFlThjXY=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/modemmanager-qt-6.18.0.tar.xz", + "hash": "sha256-yMDBxtbIFe+hG44xu7P16AFHidfgur+hV0KAvmeR0BM=" }, "networkmanager-qt": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/networkmanager-qt-6.17.0.tar.xz", - "hash": "sha256-2Dvq6Gf7fWaYhvUTiT+O7Fi116JLQp2J3FxsCLej9OA=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/networkmanager-qt-6.18.0.tar.xz", + "hash": "sha256-SSg2p0oDukP6z1LoJ0KPiI8T1uK7g3SBmGlwcoCgMQw=" }, "prison": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/prison-6.17.0.tar.xz", - "hash": "sha256-VULdBzPga+rm+M+L8n/5gfNCBf6YEl2RC+LFP/9HAHw=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/prison-6.18.0.tar.xz", + "hash": "sha256-OKTxVLObTS5LhtFvhIRgOdJ71wyybs1Ii1kfYS3UFB4=" }, "purpose": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/purpose-6.17.0.tar.xz", - "hash": "sha256-aJVl1esJmeHM2S6PhB/IJBqwJInKbDOfSNVBtbqTdko=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/purpose-6.18.0.tar.xz", + "hash": "sha256-pCjk9JVlgkCJngLxW3qSMOPDMGlyO0Phc0wh+hojuCU=" }, "qqc2-desktop-style": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/qqc2-desktop-style-6.17.0.tar.xz", - "hash": "sha256-YxvYnVyCp/k+omvCB50d+Bwy518XfTNGqcsQqc10d5c=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/qqc2-desktop-style-6.18.0.tar.xz", + "hash": "sha256-kaYOD++ilKM38lGcd/8kBbhu/5nz6g6Pw+NCZe9GcPI=" }, "solid": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/solid-6.17.0.tar.xz", - "hash": "sha256-F/BRDvE0tm5kfuIXtkhwUy11fHIcgV8gxJVnuXnJxyU=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/solid-6.18.0.tar.xz", + "hash": "sha256-d2jB2n7jSp43z7a1tyfmkMgBNMpCS1Ji5APkjM+BLd8=" }, "sonnet": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/sonnet-6.17.0.tar.xz", - "hash": "sha256-Sv726cpy7bbCKAC0rPtFDfcSHlB3yFITrKX1arn0Fgs=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/sonnet-6.18.0.tar.xz", + "hash": "sha256-LZTJV6PF8iMmU614KykeK5We6m3Kg8wJyuYhvJg0qyU=" }, "syndication": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/syndication-6.17.0.tar.xz", - "hash": "sha256-1acUsJ72pQtn9V1Y+Mbu+hu6VSUn3tEUWEi1RmMw6pM=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/syndication-6.18.0.tar.xz", + "hash": "sha256-oC92+KlCKF+KZCM/sJ9k0o9R7vnpb0td19E9TIOTO5Q=" }, "syntax-highlighting": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/syntax-highlighting-6.17.0.tar.xz", - "hash": "sha256-PRa+wPvrhTvmhMNfR1UNWYFNsfS3B+x3uGLzZQ81P8w=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/syntax-highlighting-6.18.0.tar.xz", + "hash": "sha256-i+gFciGpgsjR/kL5VFT6yWEOtRl1ImxmUmiSk80zW/0=" }, "threadweaver": { - "version": "6.17.0", - "url": "mirror://kde/stable/frameworks/6.17/threadweaver-6.17.0.tar.xz", - "hash": "sha256-dx/4nBwBKj6iuu1YyAPs1+iwuJKOOuvBHAffXM8FT0Q=" + "version": "6.18.0", + "url": "mirror://kde/stable/frameworks/6.18/threadweaver-6.18.0.tar.xz", + "hash": "sha256-puf0yQubkwTvZ6D/+t13ZVdXxl977gDDWziu/IaeMng=" } } \ No newline at end of file diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1771d9880b29..a4090cb4ef20 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -477,6 +477,7 @@ lib.makeOverridable ( # Keep some extra files on some arches (powerpc, aarch64) for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do if [ -f "$buildRoot/$f" ]; then + mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)" cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f fi done diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c9c027852762..c2d9abd53d29 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.46"; - hash = "sha256-F3a13wXACJrKHLbEcq+Z+cw08/8Ttqut76osvZ9qdTY="; + version = "6.12.47"; + hash = "sha256-jR1VqFE1jF5mTRAp+Xxswmh9bMIolJtCk4QgMHzIhao="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.16.6"; - hash = "sha256-ayNw64Wkg4HKnxEuvmGmgkJB3wLKqKAkK70mgX3eJJ8="; + version = "6.16.7"; + hash = "sha256-/CFSGaDbK0pZgGGOOxixwOQgeD1OsbUhtRss4VbXHxE="; }; }; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index e06b735377a7..dbb1a1537343 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "nct6687d"; - version = "0-unstable-2025-06-30"; + version = "0-unstable-2025-08-23"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "66ddfee6fb6b8515fb8a27698acbb9b2b8e9d2c2"; - hash = "sha256-orlYpmU+wIxVyPjuk/faQrGKtEcliWI2Hgxcw5DReX4="; + rev = "b4c600d60ad26f01d11f75d40cb574c5e77e11b6"; + hash = "sha256-w/4mZZbGi+tTEJW25h+E8yi4YYfv7cxaMlVR7TkQCdc="; }; setSourceRoot = '' diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index fd62fdcb4a63..3dfdeb25c814 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "r8125"; - version = "9.016.00"; + version = "9.016.01"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "r8125"; tag = "upstream/${finalAttrs.version}"; - hash = "sha256-dWsJNU25LxlXw9W+RVcC3zpHgsuUb+59OVidHqIYrYw="; + hash = "sha256-Sg+f27nujBFtk0UxhVlc3c07MZVGVkEFAP5BH/NE0C4="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index f501e5c6a317..12b10c58c598 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "0-unstable-2025-08-09"; + version = "0-unstable-2025-09-05"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "52072d874840f28c247b27f5d799f2c5c88a7e61"; - hash = "sha256-Lu3ol0iKfM9/SJ5lieh4A28h02Stc971ZypfiB2BWJ0="; + rev = "bb0ed9d5709afd30e928d2d11f7b650e03c8c72b"; + hash = "sha256-ySIj9ZSIwdsn3WDFZ48xUGTFLA1BMU+hjvpDwifq4k4="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 32a963e12cd0..6b87c7b481be 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -195,8 +195,6 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; - version = "257.8"; - # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. # command: @@ -207,14 +205,15 @@ let kbd' = if withPam then kbd else kbd.override { withVlock = false; }; in stdenv.mkDerivation (finalAttrs: { - inherit pname version; + inherit pname; + version = "257.8"; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; repo = "systemd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY="; }; @@ -456,7 +455,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 (lib.mesonOption "time-epoch" releaseTimestamp) - (lib.mesonOption "version-tag" version) + (lib.mesonOption "version-tag" finalAttrs.version) (lib.mesonOption "mode" "release") (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d") @@ -491,7 +490,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "sbat-distro-summary" "NixOS") (lib.mesonOption "sbat-distro-url" "https://nixos.org/") (lib.mesonOption "sbat-distro-pkgname" pname) - (lib.mesonOption "sbat-distro-version" version) + (lib.mesonOption "sbat-distro-version" finalAttrs.version) # Users (lib.mesonOption "system-uid-max" "999") diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix index 2bb01c5a836b..2ac25fef650f 100644 --- a/pkgs/os-specific/linux/tt-kmd/default.nix +++ b/pkgs/os-specific/linux/tt-kmd/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tt-kmd"; - version = "2.0.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-kmd"; tag = "ttkmd-${finalAttrs.version}"; - hash = "sha256-Y85857oWzsltRyRWpK8Wi0H38mBFwqM3+iXkwVK4DPY="; + hash = "sha256-o9F6WsiNQGD/0VraBVO2oEwPTc2Yjh3aitvITp/M2+4="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 7386e0b8ddf1..a9f579fb6154 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -7,22 +7,34 @@ kmod, pahole, gitUpdater, + udevCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.14.0"; + version = "4.15.4"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-79YZaK8WrHOxSUJWxi4lc+foh4xz3EgRnjw+OrL8yqU="; + hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY="; }; + patches = [ ./no-cp-etc-usr.patch ]; + + postInstall = '' + echo "Running postInstallhook" + install -Dm 0644 -t $out/etc/udev/rules.d usr/lib/udev/rules.d/* + ''; + buildInputs = [ pahole ]; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + kmod + udevCheckHook + ] + ++ kernel.moduleBuildDependencies; makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" @@ -30,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { "INSTALL_MOD_PATH=${placeholder "out"}" ]; + doInstallCheck = true; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch new file mode 100644 index 000000000000..9e94a43d60c5 --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 75a6bc1..6021d42 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,6 @@ all: + + install: all + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install +- cp -r etc usr / + + clean: + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index b465aec91378..7ff30d8a4118 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "dlundqvist"; repo = "xone"; tag = "v${finalAttrs.version}"; - hash = "sha256-ab/OlVezruvccKzcM4Ews6ydAJ8r64XfkPlFYpUycLQ="; + hash = "sha256-1X2GNQb3Ia61w+IxMnl4XSAYdt1vhYYcSowP52XsUVM="; }; setSourceRoot = '' diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 2159c1132dd3..c0deead18dd4 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -91,25 +91,34 @@ stdenv.mkDerivation rec { ]; buildPhase = lib.optionalString useLibTensorflow '' + runHook preBuild + cd recognize # Install tfjs dependency export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include" cd node_modules/@tensorflow/tfjs-node node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs} + rm -r ./build-tmp-napi-v*/ cd - # Test tfjs returns exit code 0 node src/test_libtensorflow.js cd .. + + runHook postBuild ''; installPhase = '' + runHook preInstall + approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))" if [ -d "$approot" ]; then mv "$approot/" $out chmod -R a-w $out fi + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 827239f0ae60..03eb8bbed8b6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pgmq"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tembo-io"; repo = "pgmq"; tag = "v${finalAttrs.version}"; - hash = "sha256-ddlExWqAJXijLl9skEkZu5ZH9X+cTreT38pZ3izt8j0="; + hash = "sha256-CnXweDsLO2yE+z1tPADqz54Q1rswsKoUVYbdiZFEbPs="; }; sourceRoot = "${finalAttrs.src.name}/pgmq-extension"; diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 7be1d7a10b8d..7758fc16543f 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.12", - "uiVersion": "0.19.12", - "serverHash": "sha256-1xkm2iKoeNXuTW5ZMKPQyqePTUqKXJ5upz97MVwqjzo=", - "serverCargoHash": "sha256-QnDN0Lvfw8d5SF7nrb8hBVG2gwT1xgEhYlLElfR15Z0=", - "uiHash": "sha256-bxppQtDFgxvdeBE/8PsfBNpnEdvX8AoELyhrwEV8Hsg=", + "serverVersion": "0.19.13", + "uiVersion": "0.19.13", + "serverHash": "sha256-EKZZsJ8B111z+5SC79arMQaPfhQBNX4uYXyRtU8yAJM=", + "serverCargoHash": "sha256-sMPLxuG3leCVHqTK4MD5F3RxbO7u6om/vb0opquoa3I=", + "uiHash": "sha256-SU/JS3LdSm4gEfwG9JXPH0WPzmT/8hiSEpuJdXpaywc=", "uiPNPMDepsHash": "sha256-tuarUG1uKx6Q1O+rF6DHyK8MEseF9lKk34qtRWWScAg=" } diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index aeb39b59a2da..35a16c146e67 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -195,7 +195,7 @@ let pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv - # Uses the expression that is used by the most cross-compil_ed_ GHCs + # Uses the expression that is used by the most cross-compiled GHCs pkgs.pkgsCross.riscv64.haskell.compiler.native-bignum.ghc948 ] @@ -206,7 +206,7 @@ let pkgs.pkgsMusl.pkgsCross.gnu64.hello # Two web browsers -- exercises almost the entire packageset - pkgs.pkgsCross.aarch64-multiplatform.qutebrowser-qt5 + pkgs.pkgsCross.aarch64-multiplatform.qutebrowser pkgs.pkgsCross.aarch64-multiplatform.firefox # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859 diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index d6a28ece4163..83def1dd150f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { property shared by most LZ compression algorithms, such as zlib. ''; homepage = "https://facebook.github.io/zstd/"; - changelog = "https://github.com/facebook/zstd/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/facebook/zstd/blob/v${finalAttrs.version}/CHANGELOG"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. mainProgram = "zstd"; platforms = platforms.all; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix index 49245c0ef7ae..0df8de3ba6b6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-chewing/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ibus-chewing"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "chewing"; repo = "ibus-chewing"; tag = "v${finalAttrs.version}"; - hash = "sha256-jg7o5vrXKH+QxemJRvZ8IUJ4HRK9axYqnwUMmr4ebGY="; + hash = "sha256-griEIWdIcnHrTcHTfF/a8QFigmnAZ36YmUVMvTLZ1x4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index e421a0d62a88..66aeed199312 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.27.72"; + version = "2.27.73"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-f7ecfmGCkWvDwL7TBXG6zVC6tEXbgXZHEZInaEubjqU="; + hash = "sha256-4P9QluxQkXxnAI4IVmBpPDfjTYVAb1p10XypzccFz4g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 727ae28b0feb..4573325396dd 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -159,6 +159,15 @@ lib.makeExtensible ( inherit src; hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8="; }; + + patches = [ + # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731 + (fetchpatch2 { + name = "lix-lowdown-1.4.0.patch"; + url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch"; + hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY="; + }) + ]; }; }; diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index c2fc238de8e0..c7d1b566170a 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -19,14 +19,14 @@ let }: buildNpmPackage rec { pname = name; - version = "2025.7.0"; + version = "2025.8.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-ExsOPSU7JT9Q8BCmREJHJSDFx8sGeL8iUKs8F8SZMeQ="; + hash = "sha256-+c6naHlcm05X+xiljbkBWaqCZpRn4GIl/Fg1jcXMcHo="; }; postPatch = '' @@ -38,7 +38,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-BV1MvqXOJmnTMHf7mQ1U1vz38b5w1IH9whS3IOD5TqQ="; + npmDepsHash = "sha256-0Q54LZVbeRkJFZ+WU5FeF23q3Ak43XDrXhZxqdrfA/I="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 6973094b569b..92bfd09fef2a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2506.0"; + version = "8.2508.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-bW/QJXyV51Z2XU1YWoM9VN06Dl7rgwi4YqgbNop0u3s="; + hash = "sha256-yJsedNNtDKSpW3Shq+Nu0LH6rIt8i+RxqEFc+ndiBv0="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ffcc8a553d97..7a170f07622e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1509,7 +1509,31 @@ mapAliases { luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27 lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 - lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 + lxd = throw '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + ''; # Added 2025-09-05 + lxd-lts = throw '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + ''; # Added 2025-09-05 + lxd-ui = throw '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + ''; # Added 2025-09-05 + lxd-unwrapped = throw '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + ''; # Added 2025-09-05 + lxd-unwrapped-lts = throw '' + LXD has been removed from NixOS due to lack of Nixpkgs maintenance. + Consider migrating or switching to Incus, or remove from your configuration. + https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/ + ''; # Added 2025-09-05 lxde = { gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; @@ -1529,7 +1553,6 @@ mapAliases { lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31 }; - lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02 @@ -2047,6 +2070,7 @@ mapAliases { psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10 ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10 purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17 + purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01 pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28 @@ -2369,12 +2393,14 @@ mapAliases { tepl = libgedit-tepl; # Added 2024-04-29 termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 testVersion = testers.testVersion; # Added 2022-04-20 + textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10 texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08 tezos-rust-libs = ligo; # Added 2025-06-03 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 + ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10 tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 @@ -2706,7 +2732,6 @@ mapAliases { purple-googlechat purple-hangouts purple-lurch - purple-matrix purple-mm-sms purple-plugin-pack purple-slack diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b42deb1b94ef..fc6e6860fef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4402,9 +4402,7 @@ with pkgs; ufmt = with python3Packages; toPythonApplication ufmt; - uim = callPackage ../tools/inputmethods/uim { - autoconf = buildPackages.autoconf269; - }; + uim = callPackage ../tools/inputmethods/uim { }; unbound-with-systemd = unbound.override { withSystemd = true; @@ -9184,6 +9182,7 @@ with pkgs; zig_0_15 ; + # If this is updated, the default zls version should also be updated to match the default zig version. zig = zig_0_15; zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv; @@ -9194,7 +9193,7 @@ with pkgs; ; # This should be kept updated to ensure the default zls version matches the default zig version. - zls = zls_0_14; + zls = zls_0_15; libzint = zint-qt.override { withGUI = false; }; @@ -9870,6 +9869,8 @@ with pkgs; nsd = callPackage ../servers/dns/nsd (config.nsd or { }); + nsdiff = perlPackages.nsdiff; + outline = callPackage ../servers/web-apps/outline ( lib.fix (super: { yarn = yarn.override { inherit (super) nodejs; }; @@ -14856,6 +14857,8 @@ with pkgs; j2cli = with python311Packages; toPythonApplication j2cli; + j2lint = with python3Packages; toPythonApplication j2lint; + kmonad = haskellPackages.kmonad.bin; # In general we only want keep the last three minor versions around that diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 65e95e54aefc..bf64ea4cbe3d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -26773,6 +26773,43 @@ with self; }; }; + nsdiff = buildPerlPackage { + pname = "nsdiff"; + version = "1.85"; + + src = fetchurl { + url = "https://dotat.at/prog/nsdiff/DNS-nsdiff-1.85.tar.gz"; + hash = "sha256-yo4WDa/xZL+5m+i3RnqDBZkGcl+tqR118laRez0xNAA="; + }; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + + preFixup = '' + # nsdiff requires dig and named-compilezone + wrapProgram $out/bin/nsdiff --prefix PATH : ${ + with pkgs; + lib.makeBinPath [ + dig + dnsutils + ] + } + # nsvi requires dig and nsdiff + wrapProgram $out/bin/nsvi --prefix PATH : ${lib.makeBinPath [ pkgs.dig ]} + # nspatch only requires nsdiff + ''; + + meta = { + description = "Create a \"nsupdate\" script from DNS zone file differences"; + homepage = "https://dotat.at/prog/nsdiff/"; + license = with lib.licenses; [ + mit0 + bsd0 + ]; + maintainers = [ maintainers.mynacol ]; + mainProgram = "nsdiff"; + }; + }; + PackageConstants = buildPerlPackage { pname = "Package-Constants"; version = "0.06"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d8c838dba4f..dac11ca3e051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,12 @@ self: super: with self; { backoff = callPackage ../development/python-modules/backoff { }; + backports-asyncio-runner = + if pythonAtLeast "3.11" then + null + else + callPackage ../development/python-modules/backports-asyncio-runner { }; + backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; @@ -1911,6 +1917,8 @@ self: super: with self; { binsync = callPackage ../development/python-modules/binsync { }; + biocutils = callPackage ../development/python-modules/biocutils { }; + biom-format = callPackage ../development/python-modules/biom-format { }; biopandas = callPackage ../development/python-modules/biopandas { }; @@ -7321,6 +7329,8 @@ self: super: with self; { j2cli = callPackage ../development/python-modules/j2cli { }; + j2lint = callPackage ../development/python-modules/j2lint { }; + jaconv = callPackage ../development/python-modules/jaconv { }; jalali-core = callPackage ../development/python-modules/jalali-core { }; @@ -11427,6 +11437,8 @@ self: super: with self; { parsley = callPackage ../development/python-modules/parsley { }; + parsnip = callPackage ../development/python-modules/parsnip { }; + parso = callPackage ../development/python-modules/parso { }; parsy = callPackage ../development/python-modules/parsy { };