Merge master into staging-nixos (ebdfe303) · Commits · nix / nixpkgs

doc/release-notes/rl-2605.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@

		- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md)

		- `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/).

		- `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).

		- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.

+0 −12

Original line number	Diff line number	Diff line
		@@ -11530,12 +11530,6 @@
		github = "ivalery111";
		githubId = 37245535;
		};
		ivan = {
		email = "ivan@ludios.org";
		github = "ivan";
		githubId = 4458;
		name = "Ivan Kozik";
		};
		ivan-babrou = {
		email = "nixpkgs@ivan.computer";
		name = "Ivan Babrou";
		@@ -26317,12 +26311,6 @@
		name = "Trent Baldwin";
		keys = [ { fingerprint = "930C 3A61 F911 1296 7DA5 56D1 665A 9E2A FCDD 68AA"; } ];
		};
		tbenst = {
		email = "nix@tylerbenster.com";
		github = "tbenst";
		githubId = 863327;
		name = "Tyler Benster";
		};
		tbidne = {
		email = "tbidne@protonmail.com";
		github = "tbidne";

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ let
		) (lib.attrValues config.networking.vswitches)
		)
		++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bonds))
		++ lib.attrNames config.networking.wireguard.interfaces
		++ config.networking.dhcpcd.denyInterfaces;

		arrayAppendOrNull =

+14 −4

Original line number	Diff line number	Diff line
		import sys

		import dataclasses
		from urllib import request
		from urllib.error import HTTPError
		@@ -43,13 +45,17 @@ class VersionFetcher:
		self, ide: Ide, ignore_no_url_error=False
		) -> VersionInfo \| None:
		if ide.update_info is None:
		print(f"[!] no update info for {ide.name} in `updateInfo.json` - skipping!")
		print(
		f"[!] no update info for {ide.name} in `updateInfo.json` - skipping!",
		file=sys.stderr,
		)
		return None
		channel_name = ide.update_info["channel"]
		channel = self.channels.get(channel_name)
		if channel is None:
		print(
		f"[!] failed to find IDE channel {channel_name} - skipping! check {ide.name}'s `channel`!"
		f"[!] failed to find IDE channel {channel_name} - skipping! check {ide.name}'s `channel`!",
		file=sys.stderr,
		)
		return None
		try:
		@@ -73,7 +79,8 @@ class VersionFetcher:
		)
		if not download_url and not ignore_no_url_error:
		print(
		f"[!] no valid URL found for '{ide.name}' for '{system}'! make sure `updater/updateInfo.json` contains an entry and is correct."
		f"[!] no valid URL found for '{ide.name}' for '{system}'! make sure `updater/updateInfo.json` contains an entry and is correct.",
		file=sys.stderr,
		)
		download_urls[system] = None
		else:
		@@ -84,7 +91,10 @@ class VersionFetcher:
		urls=download_urls,
		)
		except Exception as e:
		print(f"[!] exception while trying to fetch version: {e} - skipping!")
		print(
		f"[!] exception while trying to fetch version: {e} - skipping!",
		file=sys.stderr,
		)
		return None

		@classmethod

+6 −2

Original line number	Diff line number	Diff line
		import sys

		from jetbrains_nix_updater.config import UpdaterConfig
		from jetbrains_nix_updater.fetcher import VersionInfo
		from jetbrains_nix_updater.ides import Ide
		from jetbrains_nix_updater.util import replace_blocks, convert_hash_to_sri


		def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
		def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
		urls_nix = ""
		for system, url in info.urls.items():
		urls_nix += f"""
		@@ -33,5 +35,7 @@ def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
		),
		],
		)
		return True
		except Exception as e:
		print(f"[!] Writing update info to file failed: {e}")
		print(f"[!] Writing update info to file failed: {e}", file=sys.stderr)
		return False