From f4841acf7075c3b029b9dc4f09841fc6b2a4cf42 Mon Sep 17 00:00:00 2001 From: Qubic <77882752+AwesomeQubic@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:09:20 +0100 Subject: [PATCH 01/28] pulseview: 0.4.2-unstable-2025-05-15 -> 0.5.0-unstable-2025-11-10 --- pkgs/applications/science/electronics/pulseview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 99727944889d..2582f03ccd92 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation { pname = "pulseview"; - version = "0.4.2-unstable-2025-05-15"; + version = "0.5.0-unstable-2025-11-10"; src = fetchFromGitHub { owner = "sigrokproject"; repo = "pulseview"; - rev = "e2fe9dfb91c7de85c410922ee9268c3f526bcc54"; - hash = "sha256-b9pqtsF5J9MA7XMIgFZltrVqi64ZPObBTiaws3zSDRg="; + rev = "af02198741b4e57c9f9b796bd5e6c0f2ae9f2f2b"; + hash = "sha256-4K3sMCTlFnu8iiokMYc1O7jNVQ7vTtSiT2dCpLRC44s="; }; nativeBuildInputs = [ From de4a2e872398dc9b44ed1c3c8794a544ccab47d0 Mon Sep 17 00:00:00 2001 From: Qubic <77882752+AwesomeQubic@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:09:39 +0100 Subject: [PATCH 02/28] libsigrok: 0.5.2-unstable-2024-10-20 -> 0.6.0-unstable-2025-11-20 --- pkgs/by-name/li/libsigrok/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libsigrok/package.nix b/pkgs/by-name/li/libsigrok/package.nix index 88a30b609e2b..5b8a9dbf62e9 100644 --- a/pkgs/by-name/li/libsigrok/package.nix +++ b/pkgs/by-name/li/libsigrok/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchgit, autoreconfHook, pkg-config, libzip, @@ -17,16 +16,16 @@ libieee1284, bluez, sigrok-firmware-fx2lafw, + fetchgit, }: - stdenv.mkDerivation { pname = "libsigrok"; - version = "0.5.2-unstable-2024-10-20"; + version = "0.6.0-unstable-2025-11-20"; src = fetchgit { url = "git://sigrok.org/libsigrok"; - rev = "f06f788118191d19fdbbb37046d3bd5cec91adb1"; - hash = "sha256-8aco5tymkCJ6ya1hyp2ODrz+dlXvZmcYoo4o9YC6D6o="; + rev = "0bc2487778e660f4d3116729b6f4aee2b1996bb0"; + hash = "sha256-j79Wx5FFFKptcwtIjQ0Cvtzl46lnow6bExpMNzI8KlM="; }; enableParallelBuilding = true; @@ -76,6 +75,11 @@ stdenv.mkDerivation { meta = { description = "Core library of the sigrok signal analysis software suite"; + longDescription = " + Core library of the sigrok signal analysis software suite + + Please note that if you are using slogic devices you must overlay libsigrok-sipeed as this library for your device to work + "; homepage = "https://sigrok.org/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; From a93944d26b8310fec458d51ca2c7b0b120300bff Mon Sep 17 00:00:00 2001 From: Qubic <77882752+AwesomeQubic@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:09:53 +0100 Subject: [PATCH 03/28] libsigrok-sipeed: init at 0.6.0-unstable-2025-12-17 --- pkgs/by-name/li/libsigrok-sipeed/package.nix | 88 ++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 pkgs/by-name/li/libsigrok-sipeed/package.nix diff --git a/pkgs/by-name/li/libsigrok-sipeed/package.nix b/pkgs/by-name/li/libsigrok-sipeed/package.nix new file mode 100644 index 000000000000..43874dfe8b13 --- /dev/null +++ b/pkgs/by-name/li/libsigrok-sipeed/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libzip, + glib, + libusb1, + libftdi1, + check, + libserialport, + doxygen, + glibmm, + python3, + hidapi, + libieee1284, + bluez, + sigrok-firmware-fx2lafw, +}: +#To future maintainers this package should be deprecated and or removed when https://github.com/sigrokproject/libsigrok/pull/275 gets merged +stdenv.mkDerivation { + pname = "libsigrok-sipeed"; + version = "0.6.0-unstable-2025-12-17"; + + #Use sipeed fork since it seems to be more up to date and supports my device + src = fetchFromGitHub { + owner = "sipeed"; + repo = "libsigrok"; + rev = "0ce0720421b6bcc8e65a0c94c5b2883cbfe22d7e"; + hash = "sha256-4aqX+OX4bBsvvb7b1XHKqG6u1Ek3floXDfjr27usZwo="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + python3 + ]; + buildInputs = [ + libzip + glib + libusb1 + libftdi1 + check + libserialport + glibmm + hidapi + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libieee1284 + bluez + ]; + + strictDeps = true; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp contrib/*.rules $out/etc/udev/rules.d + + mkdir -p "$out/share/sigrok-firmware/" + cp ${sigrok-firmware-fx2lafw}/share/sigrok-firmware/* "$out/share/sigrok-firmware/" + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # assert that c++ bindings are included + # note that this is only true for modern (>0.5) versions; the 0.3 series does not have these + [[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \ + || { echo 'C++ bindings were not generated; check configure output'; false; } + + runHook postInstallCheck + ''; + + meta = { + description = "A fork of libsigrok with slogic devices support "; + homepage = "https://github.com/sipeed/libsigrok/"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ + qubic + ]; + }; +} From 512badeac7bc7d3173045591e1fe4813f5fe7ea9 Mon Sep 17 00:00:00 2001 From: Qubic <77882752+AwesomeQubic@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:10:12 +0100 Subject: [PATCH 04/28] sigrok-cli: 0.7.2-unstable-2023-04-10 -> 0.8.0-unstable-2024-08-26 --- pkgs/by-name/si/sigrok-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sigrok-cli/package.nix b/pkgs/by-name/si/sigrok-cli/package.nix index 102f6a985396..288cd335f9a9 100644 --- a/pkgs/by-name/si/sigrok-cli/package.nix +++ b/pkgs/by-name/si/sigrok-cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { pname = "sigrok-cli"; - version = "0.7.2-unstable-2023-04-10"; + version = "0.8.0-unstable-2024-08-26"; src = fetchgit { url = "git://sigrok.org/sigrok-cli"; - rev = "9d9f7b82008e3b3665bda12a63a3339e9f7aabc3"; - hash = "sha256-B2FJxRkfKELrtqxZDv5QTvntpu9zJnTK15CAUYbf+5M="; + rev = "f44dd91347e7ac797cefc23162b9fcf0b7329f1f"; + hash = "sha256-LJ+32XiQYfjMLYze/zICVKvqmhtyc85zvxAXXi2HIi0="; }; nativeBuildInputs = [ From 3906bfb0c936c761104b854c78dc3c49c3bdbeae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Feb 2026 00:03:05 +0000 Subject: [PATCH 05/28] ha-mcp: 6.6.1 -> 6.7.1 --- pkgs/by-name/ha/ha-mcp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix index a1bd0d192ba1..a70f3b510f09 100644 --- a/pkgs/by-name/ha/ha-mcp/package.nix +++ b/pkgs/by-name/ha/ha-mcp/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ha-mcp"; - version = "6.6.1"; + version = "6.7.1"; pyproject = true; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY="; + hash = "sha256-CQbjPEtCos0Fi6aAaIWSRMCUQKmjYviYkvJZzbCZg6Y="; }; build-system = with python3Packages; [ From 4a20fb191683e5696660b4c9064d9739578e421a Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 18 Feb 2026 02:25:26 +0000 Subject: [PATCH 06/28] top-level: add warning for `x86_64-darwin` deprecation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’ve never deprecated a platform in widespread use before, and it seems prudent to warn users about the upcoming end of support so they can plan appropriately. I tried to make this relatively unobtrusive by taking advantage of the import cache and offering a way to turn it off, but I anticipate there might still be issues with e.g. `nix shell nixpkgs#…` and spammy warnings from multiple instantiations of Nixpkgs. I’m not sure there’s much we can do about that unless we take a different strategy entirely; `nix shell --impure nixpkgs#…` with a `~/.config/nixpkgs/config.nix` is about the best UX we can hope to offer with the restrictions of flakes. --- doc/redirects.json | 3 ++ doc/release-notes/rl-2605.section.md | 21 ++++++++++++ pkgs/top-level/config.nix | 4 +-- pkgs/top-level/default.nix | 32 +++++++++++++++++-- .../nixpkgs-basic-release-checks.nix | 6 ++-- 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/doc/redirects.json b/doc/redirects.json index f5dbb8bb65f8..03285903666e 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -869,6 +869,9 @@ "tar-files": [ "index.html#tar-files" ], + "x86_64-darwin-26.05": [ + "release-notes.html#x86_64-darwin-26.05" + ], "zip-files": [ "index.html#zip-files" ], diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index cf9f53baba96..0d70f1108d58 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -12,6 +12,27 @@ - Ruby default version has been updated from 3.3 to 3.4. Refer to the [upstream release announcement](https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-0-released/) for details. +- []{#x86_64-darwin-26.05} + + **This will be the last release of Nixpkgs to support `x86_64-darwin`.** + Platform support will be maintained and binaries built until Nixpkgs 26.05 goes out of support at the end of 2026. + For 26.11, due to Apple’s deprecation of the platform and limited build infrastructure and developer time, we will no longer build packages for `x86_64-darwin` or support building them from source. + + By the time of 26.11’s release, Homebrew will offer only limited [Tier 3](https://docs.brew.sh/Support-Tiers#tier-3) support for the platform, but MacPorts will likely continue to support it for a long time. + We also recommend users consider installing NixOS, which should continue to run on essentially all Intel Macs, especially after Apple stops security support for macOS 26 in 2028. + + A warning will be displayed for `x86_64-darwin` users; you can set [](#opt-allowDeprecatedx86_64Darwin) in the [Nixpkgs configuration](https://nixos.org/manual/nixpkgs/stable/#chap-packageconfig) to silence it. + The {file}`~/.config/nixpkgs/config.nix` file will not work for users of flakes, who can instead replace `nixpkgs.legacyPackages.x86_64-darwin` with + + ```nix + import nixpkgs { + system = "x86_64-darwin"; + config.allowDeprecatedx86_64Darwin = true; + } + ``` + + nix-darwin users can set [`nixpkgs.config.allowDeprecatedx86_64Darwin`](https://nix-darwin.github.io/nix-darwin/manual/index.html#opt-nixpkgs.config) in their system configurations. + - The Factor programming language has been updated to Version 0.101 bringing various improvements to UI rendering and HiDPI support as well as support for Unicode 17.0.0. Starting from Version 0.100, the Factor VM is compiled with Clang. diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 7efb30525420..8f700a07eb0e 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -451,8 +451,8 @@ let Silence the warning for the upcoming deprecation of the `x86_64-darwin` platform in Nixpkgs 26.11. - This does nothing in 25.11, and is provided there for forward - compatibility of configurations with 26.05. + See the [release notes](#x86_64-darwin-26.05) for more + information. ''; }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 607145be06aa..521745d67ec9 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -18,6 +18,25 @@ or dot-files. */ +let + # We hoist this above the closure so that the same thunk is shared + # between multiple imports of Nixpkgs. This ensures that commands + # like `nix eval nixpkgs#legacyPackages.x86_64-darwin.pkgsStatic.hello` + # print only one warning, which would otherwise be spammy in common + # scenarios that instantiate many copies of Nixpkgs. + # + # Unfortunately, flakes’ handling of transitive dependencies mean + # that it’s still likely users will see multiple warnings, but + # there’s nothing we can do about that within the constraints of the + # Nix language. + x86_64DarwinDeprecationWarning = + pristineLib.warn + "Nixpkgs 26.05 will be the last release to support x86_64-darwin; see https://nixos.org/manual/nixpkgs/unstable/release-notes#x86_64-darwin-26.05" + (x: x); + + pristineLib = import ../../lib; +in + { # The system packages will be built on. See the manual for the # subtle division of labor between these two `*System`s and the three @@ -55,8 +74,6 @@ let # Rename the function arguments in let - pristineLib = import ../../lib; - lib = if __allowFileset then pristineLib @@ -82,8 +99,17 @@ let (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.") (throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.") (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.") + (throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions.") ( - throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions." + if + ( + ((localSystem.isDarwin && localSystem.isx86) || (crossSystem.isDarwin && crossSystem.isx86)) + && config.allowDeprecatedx86_64Darwin == false + ) + then + x86_64DarwinDeprecationWarning + else + x: x ); localSystem = lib.systems.elaborate args.localSystem; diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index ed88991dd2cd..7ec445402772 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -56,7 +56,7 @@ pkgs.runCommand "nixpkgs-release-checks" set -x nix-env -f $src \ --show-trace --argstr system "$platform" \ - --arg config '{ allowAliases = false; }' \ + --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2> eval-warnings.log > packages1 @@ -72,7 +72,7 @@ pkgs.runCommand "nixpkgs-release-checks" nix-env -f $src2 \ --show-trace --argstr system "$platform" \ - --arg config '{ allowAliases = false; }' \ + --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" > packages2 @@ -95,7 +95,7 @@ pkgs.runCommand "nixpkgs-release-checks" nix-env -f $src \ --show-trace --argstr system "$platform" \ - --arg config '{ allowAliases = false; }' \ + --arg config '{ allowAliases = false; allowDeprecatedx86_64Darwin = true; }' \ --option experimental-features 'no-url-literals' \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null From a96110f1998eb6631bae26051aedb0757a42c592 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Feb 2026 08:57:59 -0300 Subject: [PATCH 07/28] emacs: Add update-from-overlay.py This is a new script written in Python 3 that fetches, checks and commits the elisp package sets from nix-community/emacs-overlay. --- .../elisp-packages/update-from-overlay.py | 254 ++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100755 pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.py diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.py b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.py new file mode 100755 index 000000000000..cf8a9a47bf1e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.py @@ -0,0 +1,254 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python3 -p nix git + +import argparse +import contextlib +import dataclasses +import datetime +import logging +import os +import pathlib +import shutil +import subprocess +import sys +import urllib.request + +@dataclasses.dataclass +class EmacsOverlay: + git_url : str = f'https://github.com/nix-community/emacs-overlay' + raw_url : str = f'https://raw.githubusercontent.com/nix-community/emacs-overlay' + # The field declaration here is a hack around the error: + # ValueError: mutable default for field elisp_packages_set is not allowed: use default_factory + # See more at https://peps.python.org/pep-0557/#mutable-default-values + elisp_packages_set : dict[str, dict] = dataclasses.field(default_factory = lambda: { + 'elpa': { + 'location': 'repos/elpa', + 'basename': 'elpa-generated.nix', + 'nix_attrs': ['elpaPackages'] + }, + 'elpa-devel': { + 'location': 'repos/elpa', + 'basename': 'elpa-devel-generated.nix', + 'nix_attrs': ['elpaDevelPackages'] + }, + 'melpa': { + 'location': 'repos/melpa', + 'basename': 'recipes-archive-melpa.json', + 'nix_attrs': ['melpaPackages', + 'melpaStablePackages'] + }, + 'nongnu': { + 'location': 'repos/nongnu', + 'basename': 'nongnu-generated.nix', + 'nix_attrs': ['nongnuPackages'] + }, + 'nongnu-devel': { + 'location': 'repos/nongnu', + 'basename': 'nongnu-devel-generated.nix', + 'nix_attrs': ['nongnuDevelPackages'] + }, + }) + + def master_sha (self) -> str: + '''Return the SHA of current master tip.''' + cmdline = ['git', 'ls-remote', '--branches', self.git_url, 'refs/heads/master'] + result = subprocess.run(cmdline, capture_output = True, text = True) + return result.stdout.split()[0] + +@dataclasses.dataclass +class HereDirectory: + path : pathlib.Path = pathlib.Path('.').resolve() + + def git_root(self) -> pathlib.Path: + '''Returns the root directory of Git repository.''' + cmdline = ['git', 'rev-parse', '--show-toplevel'] + result = subprocess.run(cmdline, capture_output = True, text = True) + + return pathlib.Path(result.stdout.rstrip()).resolve() + +def main (emacs_overlay : EmacsOverlay, + here_directory : HereDirectory, + argument_parser : argparse.ArgumentParser) -> None: + '''The entry point.''' + + args = argument_parser.parse_args() + + if args.commit == None: + sha = emacs_overlay.master_sha() + else: + sha = args.commit + + match args.loglevel.lower(): + case 'debug': + loglevel = logging.DEBUG + case 'info': + loglevel = logging.INFO + case _: + loglevel = logging.INFO + + logger = get_logger(loglevel = loglevel) + + datestring = datetime.datetime.today().strftime('%Y-%m-%d') + + # The loops are decoupled because each phase interferes with the next ones; + # e.g. it is pretty possible that an Elisp package updated in fetch_fileset + # breaks the check because of another Elisp package. + for name in emacs_overlay.elisp_packages_set: + fetch_fileset(name, sha, + emacs_overlay = emacs_overlay, + here_directory = here_directory, + logger = logger) + + for name in emacs_overlay.elisp_packages_set: + check_fileset(name, + emacs_overlay = emacs_overlay, + here_directory = here_directory, + logger = logger) + + for name in emacs_overlay.elisp_packages_set: + commit_fileset(name, sha, datestring = datestring, + emacs_overlay = emacs_overlay, + here_directory = here_directory, + logger = logger) + +def get_argument_parser() -> argparse.ArgumentParser: + '''Return a getopt-style parser for command-line arguments.''' + parser = argparse.ArgumentParser( + description = 'Fetch and commit Elisp package sets from nix-community/emacs-overlay', + ) + parser.add_argument( + '--commit', + help = 'Commit to be fetched, in SHA format. If not specified, retrieve the master tip.', + default = None + ) + parser.add_argument( + '--loglevel', + help = 'Level of noisiness of logging messages. Values currently supported: INFO (default), DEBUG.', + default = 'InFo' + ) + + return parser + +def get_logger (loglevel: int) -> logging.Logger: + '''Return a basic logging facility to emit messages over console (stdout).''' + logger = logging.getLogger('update-from-overlay') + # Set the lowest level here, so that it does not clobber the one provided by + # the function argument + logger.setLevel(logging.DEBUG) + + console_formatter = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(funcName)s - %(message)s', + datefmt='[%Y-%m-%d %H:%M:%S]') + + console_handler = logging.StreamHandler(stream = sys.stdout) + console_handler.setLevel(loglevel) + console_handler.setFormatter(console_formatter) + + logger.addHandler(console_handler) + + return logger + +def fetch_fileset (name: str, sha: str, + emacs_overlay : EmacsOverlay, + here_directory : HereDirectory, + logger : logging.Logger) -> None: + '''Fetch a fileset from emacs overlay. + + Arguments: + name -- The name of fileset. + sha -- The commit SHA of emacs-overlay from which the files are retrieved. + ''' + logger.debug('BEGIN') + + location = emacs_overlay.elisp_packages_set[name]['location'] + basename = emacs_overlay.elisp_packages_set[name]['basename'] + url = f'{emacs_overlay.raw_url}/{sha}/{location}/{basename}' + + destination = pathlib.Path(here_directory.path, basename).resolve() + + logger.debug(f'Getting {url}') + + with urllib.request.urlopen (url) as input_stream, open(destination, 'wb') as output_file: + logger.info(f'Installing {destination}') + shutil.copyfileobj(input_stream, output_file) + + logger.debug('END') + +def check_fileset (name: str, + emacs_overlay : EmacsOverlay, + here_directory : HereDirectory, + logger : logging.Logger) -> None: + '''Smoke-test the fileset. + + Arguments: + name -- The name of fileset. + ''' + logger.debug('BEGIN') + + for nix_attr in emacs_overlay.elisp_packages_set[name]['nix_attrs']: + + cmdline = ['nix-instantiate', '--show-trace', here_directory.git_root(), + '-A', f'emacsPackages.{nix_attr}'] + environment = os.environ + environment['NIXPKGS_ALLOW_BROKEN'] = '1' + + logger.info(f'Testing {nix_attr}') + # TODO: capture the output (to put it in the logfile). + result = subprocess.run(cmdline, capture_output = True, text = True) + logger.debug(f''' +Shell Command: {result.args} +Output: +{result.stdout}''') + + logger.debug('END') + +def commit_fileset (name: str, sha: str, datestring : str | None, + emacs_overlay : EmacsOverlay, + here_directory : HereDirectory, + logger : logging.Logger) -> None: + '''Commit the fileset. + + Arguments: + name -- The name of fileset. + sha -- The commit SHA of emacs-overlay from which the files are retrieved. + datestring -- The date to be written on commit message. If None, use the current time. + ''' + logger.debug('BEGIN') + + nix_attrs = emacs_overlay.elisp_packages_set[name]['nix_attrs'] + basename = emacs_overlay.elisp_packages_set[name]['basename'] + + if datestring == None: + datestring = datetime.datetime.today().strftime('%Y-%m-%d') + logger.debug(f'Date string not provided, using {datestring}') + else: + logger.debug(f'Date string was provided: {datestring}') + + cmdline_verify = ['git', 'diff', '--exit-code', '--quiet', '--', basename] + result_verify = subprocess.run(cmdline_verify) + + if result_verify.returncode != 0: + attrs = ', '.join(nix_attrs) + commit_message = f'''{attrs}: Updated at {datestring} (from emacs-overlay) + +emacs-overlay commit: {sha} +''' + cmdline_commit = ['git', 'commit', '--message', commit_message, '--', basename] + result_commit = subprocess.run(cmdline_commit, capture_output = True, text = True) + logger.info(f'File {basename} committed') + logger.debug(f''' +Shell Command: {result_commit.args} +Output: +{result_commit.stdout}''') + else: + logger.info(f'File {basename} not modified, skipping') + + logger.debug('END') + +if __name__ == '__main__': + emacs_overlay = EmacsOverlay() + here_directory = HereDirectory() + argument_parser = get_argument_parser() + with contextlib.chdir(here_directory.path): + main(emacs_overlay = emacs_overlay, + here_directory = here_directory, + argument_parser = argument_parser) From 618392e7c01762359ecdda78f6ab2fd7244a3ce1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Feb 2026 02:00:14 +0000 Subject: [PATCH 08/28] nushellPlugins.skim: 0.23.1 -> 0.24.1 --- pkgs/by-name/nu/nushell-plugin-skim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nushell-plugin-skim/package.nix b/pkgs/by-name/nu/nushell-plugin-skim/package.nix index e1b99045ffcb..e6a439920a06 100644 --- a/pkgs/by-name/nu/nushell-plugin-skim/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-skim/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_skim"; - version = "0.23.1"; + version = "0.24.1"; src = fetchFromGitHub { owner = "idanarye"; repo = "nu_plugin_skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-CWjds0AWYwrKk1sgBSOalEIYJd2Aymc6XK22Bd9QLuo="; + hash = "sha256-a8wC5RowtLiVJXkDr2SDQaaLvK9jjW5x9z/cYCgJMRI="; }; - cargoHash = "sha256-mucbl0ow0FjNiDL1BNKT7BMVpMKvmKEz3dP6/9BBRV4="; + cargoHash = "sha256-/6dUbz2c0r6oV4NlmkOcu4Awky3fGkf2IkrwBpYg3ZM="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; From 33878b5f5b71617a5728c0a870319cb13d8e5610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Feb 2026 22:07:24 +0100 Subject: [PATCH 09/28] paperless-ngx: 2.20.8 -> 2.20.9 Diff: https://github.com/paperless-ngx/paperless-ngx/compare/v2.20.8...v2.20.9 Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.20.9 --- pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index a4331bbe8679..387fee34efa3 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -29,13 +29,13 @@ lndir, }: let - version = "2.20.8"; + version = "2.20.9"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-P+yZfCEdSDwThE48loJ234scTjfZ+wlgqO8Ecl503BI="; + hash = "sha256-BSRhvrbvalSBBjPNCQIyPu1S62m7oS1uqBtmVjUjwk4="; }; python = python3.override { From 1e6f8213c4b6bec6442d1c4e98f9868d1391d852 Mon Sep 17 00:00:00 2001 From: Andreas Wendleder Date: Mon, 2 Mar 2026 16:10:45 +0100 Subject: [PATCH 10/28] librelane: 3.0.0.dev52 -> 3.0.0rc0 --- pkgs/by-name/li/librelane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librelane/package.nix b/pkgs/by-name/li/librelane/package.nix index 00ee7810d9bb..2c1935e3931d 100644 --- a/pkgs/by-name/li/librelane/package.nix +++ b/pkgs/by-name/li/librelane/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "librelane"; - version = "3.0.0.dev52"; + version = "3.0.0rc0"; pyproject = true; src = fetchFromGitHub { owner = "librelane"; repo = "librelane"; tag = finalAttrs.version; - hash = "sha256-0Sh5KR0Yc4gVT2d88z1GCJZmnsE4CYMsecLjQwm/Rxs="; + hash = "sha256-YG1/Exm1sXqydBvXQcSvRH3DcJbBMxu4P/AHytu9JMI="; }; build-system = [ From e7e267b1028db29cbda78ecdca1818d775c150d7 Mon Sep 17 00:00:00 2001 From: bileamScheuvens Date: Mon, 2 Mar 2026 17:10:58 +0100 Subject: [PATCH 11/28] vimPlugins.vim-hypr-nav: init at 0-unstable-2023-11-29 https://github.com/nuchs/vim-hypr-nav --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index fdc93162aaf5..9a2e99d37e33 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -19247,6 +19247,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-hypr-nav = buildVimPlugin { + pname = "vim-hypr-nav"; + version = "0-unstable-2023-11-29"; + src = fetchFromGitHub { + owner = "nuchs"; + repo = "vim-hypr-nav"; + rev = "6ab4865a7eb5aad35305298815a4563c9d48556a"; + hash = "sha256-V4a9D3HpT1SZUrUc1XrC6SsrtKmIcFxdSVmq0Gwt/Ik="; + }; + meta.homepage = "https://github.com/nuchs/vim-hypr-nav/"; + meta.hydraPlatforms = [ ]; + }; + vim-iced-coffee-script = buildVimPlugin { pname = "vim-iced-coffee-script"; version = "0-unstable-2013-12-26"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 567be4336b8b..0c4cf196ed07 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4124,6 +4124,10 @@ assertNoAdditions { buildInputs = [ vim ]; }; + vim-hypr-nav = super.vim-hypr-nav.overrideAttrs { + runtimeDeps = [ jq ]; + }; + vim-isort = super.vim-isort.overrideAttrs { postPatch = '' substituteInPlace autoload/vimisort.vim \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 786aef23203e..a2d9cd63fe24 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1478,6 +1478,7 @@ https://github.com/vim-utils/vim-husk/,, https://github.com/hylang/vim-hy/,HEAD, https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, +https://github.com/nuchs/vim-hypr-nav/,HEAD, https://github.com/noc7c9/vim-iced-coffee-script/,, https://github.com/RRethy/vim-illuminate/,, https://github.com/preservim/vim-indent-guides/,, From e210fbc2a3af3c2a1656cde547430da6effc0e14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Mar 2026 17:46:29 +0000 Subject: [PATCH 12/28] tdlib: 1.8.61 -> 1.8.62 --- pkgs/by-name/td/tdlib/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 3bbc2a65651c..df1599a3bf04 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { pname = if tde2eOnly then "tde2e" else "tdlib"; - version = "1.8.61"; + version = "1.8.62"; src = fetchFromGitHub { owner = "tdlib"; @@ -47,8 +47,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "11e254af695060d8890024dd7faa1cc2d6685ef8"; - hash = "sha256-h69eamdx9f1XR0XFw/8mZqOcjWkjRMHE/CVKVESGBg8="; + rev = "e597838871547131ef92332fca601f5effba4e8a"; + hash = "sha256-WdBgLjaYVf50B3gIkydEddV+eDDG+VWZLiEibWQzRGw="; }; buildInputs = [ From 7b01a5fea1bc2b97da07839373e3c7bb5d327f0d Mon Sep 17 00:00:00 2001 From: Anninzy <143312793+Anninzy@users.noreply.github.com> Date: Mon, 2 Mar 2026 18:31:22 +0000 Subject: [PATCH 13/28] yaziPlugins.gvfs: init at 0-unstable-2026-02-16 --- pkgs/by-name/ya/yazi/plugins/gvfs/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/gvfs/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix b/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix new file mode 100644 index 000000000000..61e834d0a38a --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/gvfs/default.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "gvfs.yazi"; + version = "0-unstable-2026-02-16"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "gvfs.yazi"; + rev = "9d64595cd5ba669dda27d41a936e748a795e949a"; + hash = "sha256-KXx0SDcksaA7cM7UonUGVtm1JJEyC1lGja3R+fsHxtY="; + }; + + meta = { + description = "Transparently mount and unmount devices or remote storage in read and write mode"; + homepage = "https://github.com/boydaihungst/gvfs.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anninzy ]; + platforms = lib.platforms.linux; + }; +} From 7f5616d2e5ae9b8f671da617eb41f7cdca6f15e2 Mon Sep 17 00:00:00 2001 From: redianthus Date: Fri, 27 Feb 2026 13:15:48 +0100 Subject: [PATCH 14/28] ocamlPackages.pacomb: init at 1.4.3 --- .../ocaml-modules/pacomb/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/pacomb/default.nix diff --git a/pkgs/development/ocaml-modules/pacomb/default.nix b/pkgs/development/ocaml-modules/pacomb/default.nix new file mode 100644 index 000000000000..05539235afd5 --- /dev/null +++ b/pkgs/development/ocaml-modules/pacomb/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + ppxlib, + stdlib-shims, +}: + +buildDunePackage (finalAttrs: { + pname = "pacomb"; + version = "1.4.3"; + src = fetchFromGitHub { + owner = "craff"; + repo = "pacomb"; + tag = finalAttrs.version; + hash = "sha256-iS5H/xnMqZjSvrvj5YkBP8j/ChIn/xbQ9xa7WipBUvQ="; + }; + buildInputs = [ + ppxlib + ]; + propagatedBuildInputs = [ + stdlib-shims + ]; + minimalOCamlVersion = "5.3"; + + meta = { + description = "Parsing library based on combinators and ppx extension to write languages"; + homepage = "https://github.com/craff/pacomb"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ redianthus ]; + }; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 04d368e4c4c4..1d7fe1f0d38d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1689,6 +1689,8 @@ let ### P ### + pacomb = callPackage ../development/ocaml-modules/pacomb { }; + paf = callPackage ../development/ocaml-modules/paf { }; paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { From a3724141a867265eac94aa118df6f5f96856ac80 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 2 Mar 2026 22:01:22 +0100 Subject: [PATCH 15/28] jasp-desktop: fix build with boost189 --- pkgs/by-name/ja/jasp-desktop/boost.patch | 41 +++++++++++++++++++ .../jasp-desktop/link-boost-dynamically.patch | 13 ------ pkgs/by-name/ja/jasp-desktop/package.nix | 2 +- 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/ja/jasp-desktop/boost.patch delete mode 100644 pkgs/by-name/ja/jasp-desktop/link-boost-dynamically.patch diff --git a/pkgs/by-name/ja/jasp-desktop/boost.patch b/pkgs/by-name/ja/jasp-desktop/boost.patch new file mode 100644 index 000000000000..d69bc3f0a402 --- /dev/null +++ b/pkgs/by-name/ja/jasp-desktop/boost.patch @@ -0,0 +1,41 @@ +diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt +index 4251554..1600f77 100644 +--- a/Common/CMakeLists.txt ++++ b/Common/CMakeLists.txt +@@ -31,7 +31,6 @@ target_include_directories( + target_link_libraries( + Common + PUBLIC +- Boost::system + Boost::date_time + Boost::timer + Boost::chrono +diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt +index f3a87e1..1949b2a 100644 +--- a/Engine/CMakeLists.txt ++++ b/Engine/CMakeLists.txt +@@ -34,7 +34,6 @@ target_link_libraries( + QMLComponents + CommonData + Common +- Boost::system + Boost::date_time + Boost::timer + Boost::chrono +diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake +index 3b950e1..149747b 100644 +--- a/Tools/CMake/Libraries.cmake ++++ b/Tools/CMake/Libraries.cmake +@@ -67,11 +67,10 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) + endif() + endif() + +-set(Boost_USE_STATIC_LIBS ON) ++add_definitions(-DBOOST_LOG_DYN_LINK) + find_package( + Boost 1.78 REQUIRED + COMPONENTS filesystem +- system + date_time + timer + chrono) diff --git a/pkgs/by-name/ja/jasp-desktop/link-boost-dynamically.patch b/pkgs/by-name/ja/jasp-desktop/link-boost-dynamically.patch deleted file mode 100644 index 7505155dd11c..000000000000 --- a/pkgs/by-name/ja/jasp-desktop/link-boost-dynamically.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake -index a6673d9..a079021 100644 ---- a/Tools/CMake/Libraries.cmake -+++ b/Tools/CMake/Libraries.cmake -@@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) - endif() - endif() - --set(Boost_USE_STATIC_LIBS ON) -+add_definitions(-DBOOST_LOG_DYN_LINK) - find_package( - Boost 1.78 REQUIRED - COMPONENTS filesystem diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 12a859281212..76eb48ebde5f 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - ./link-boost-dynamically.patch + ./boost.patch # link boost dynamically, don't try to link removed system stub library ./disable-module-install-logic.patch # don't try to install modules via cmake ./disable-renv-logic.patch ./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules From e19eda087a9b0446976d43e830b47d252725e747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Mar 2026 21:11:16 +0000 Subject: [PATCH 16/28] fna3d: 26.02 -> 26.03 --- pkgs/by-name/fn/fna3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index 3e9cf998decf..346c0fad93e8 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fna3d"; - version = "26.02"; + version = "26.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Gwuml5ZR3m7PEqfYz/BySN9/lsb5Rbej9v0fMfUxt/I="; + hash = "sha256-P28rm36xG3/IydUKFk6Q7m0D9jpcMtAlfdLpXOrISs4="; }; cmakeFlags = [ From dd51f3e0fc59496de7aedf4ec2e7c463a80ea8b7 Mon Sep 17 00:00:00 2001 From: redianthus Date: Fri, 27 Feb 2026 13:32:24 +0100 Subject: [PATCH 17/28] ocamlPackages.cudd: init at 0.1.3 --- .../ocaml-modules/cudd/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cudd/default.nix diff --git a/pkgs/development/ocaml-modules/cudd/default.nix b/pkgs/development/ocaml-modules/cudd/default.nix new file mode 100644 index 000000000000..3d1c284aea9f --- /dev/null +++ b/pkgs/development/ocaml-modules/cudd/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildDunePackage, + fetchFromGitLab, + fetchurl, +}: + +let + cuddTarball = fetchurl { + url = "https://github.com/ivmai/cudd/archive/refs/tags/cudd-3.0.0.tar.gz"; + hash = "sha256-X+FFBBxZRonm589M1iPV8rfDYmFwi+jJpyrtcs9nrM4="; + }; +in + +buildDunePackage (finalAttrs: { + pname = "cudd"; + version = "0.1.3"; + + src = fetchFromGitLab { + domain = "git.frama-c.com"; + owner = "pub/codex"; + repo = "cudd.ml"; + tag = finalAttrs.version; + hash = "sha256-RLImpj+5fPjZTds+r1q5rGn001QQo2GzOvJQWJlBR64="; + }; + + postUnpack = '' + cp ${cuddTarball} $sourceRoot/cudd/cudd.tar.gz + ''; + + meta = { + description = "Minimal cudd bindings"; + homepage = "https://git.frama-c.com/pub/codex/cudd.ml"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ redianthus ]; + }; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 04d368e4c4c4..68fa75a4c84e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -356,6 +356,8 @@ let ctypes-foreign = callPackage ../development/ocaml-modules/ctypes/foreign.nix { }; + cudd = callPackage ../development/ocaml-modules/cudd { }; + cudf = callPackage ../development/ocaml-modules/cudf { }; curl = callPackage ../development/ocaml-modules/curl { inherit (pkgs) curl; }; From 766715bcb74fa100822127e05cf72612e283873f Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 2 Mar 2026 13:29:15 -0800 Subject: [PATCH 18/28] jamesdsp: move icon to spec-compliant location --- pkgs/by-name/ja/jamesdsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jamesdsp/package.nix b/pkgs/by-name/ja/jamesdsp/package.nix index 6d7408c76ead..da668c36f11d 100644 --- a/pkgs/by-name/ja/jamesdsp/package.nix +++ b/pkgs/by-name/ja/jamesdsp/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - install -D resources/icons/icon.png $out/share/pixmaps/jamesdsp.png + install -D resources/icons/icon.png $out/share/icons/hicolor/512x512/apps/jamesdsp.png install -D resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/jamesdsp.svg ''; From 85f8f9c9a1a362a52d8eb2e3b41d19328ba32b97 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 2 Mar 2026 21:41:13 +0000 Subject: [PATCH 19/28] libweaver.updateScript: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix eval --impure --expr 'with import ./. {}; libweaver.updateScript' error: … while evaluating the attribute 'updateScript' at pkgs/by-name/li/libweaver/package.nix:34:5: 33| passthru = { 34| updateScript = unstableGitUpdater { harcodeZeroVersion = true; }; | ^ 35| tests.cmake-config = testers.hasCmakeConfigModules { … while calling a functor (an attribute set with a '__functor' attribute) at pkgs/by-name/li/libweaver/package.nix:34:20: 33| passthru = { 34| updateScript = unstableGitUpdater { harcodeZeroVersion = true; }; | ^ 35| tests.cmake-config = testers.hasCmakeConfigModules { (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: function 'anonymous lambda' called with unexpected argument 'harcodeZeroVersion' at pkgs/common-updater/unstable-updater.nix:16:1: 15| 16| { | ^ 17| url ? null, # The git url, if empty it will be set to src.gitRepoUrl Did you mean hardcodeZeroVersion? --- pkgs/by-name/li/libweaver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libweaver/package.nix b/pkgs/by-name/li/libweaver/package.nix index bea881edb092..411d28cbf9e5 100644 --- a/pkgs/by-name/li/libweaver/package.nix +++ b/pkgs/by-name/li/libweaver/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = unstableGitUpdater { harcodeZeroVersion = true; }; + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; tests.cmake-config = testers.hasCmakeConfigModules { package = finalAttrs.finalPackage; moduleNames = [ "libweaver" ]; From ef7171171334a5e97b11628deb705d54545ee996 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Mar 2026 23:51:09 +0000 Subject: [PATCH 20/28] mpvScripts.mpv-webm: 0-unstable-2025-07-14 -> 0-unstable-2026-03-01 --- pkgs/by-name/mp/mpv/scripts/mpv-webm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-webm.nix b/pkgs/by-name/mp/mpv/scripts/mpv-webm.nix index 8913b7621792..efc41e0d613d 100644 --- a/pkgs/by-name/mp/mpv/scripts/mpv-webm.nix +++ b/pkgs/by-name/mp/mpv/scripts/mpv-webm.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-webm"; - version = "0-unstable-2025-07-14"; + version = "0-unstable-2026-03-01"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "e15234567d2064791319df1e6193fcb433602d08"; - hash = "sha256-C1N+fY5Xv6Y6tG3mTdymSlLlLYaA7XUvM0PZtkBTS4k="; + rev = "8d703b49dffa954d19a61e3c61d19514607b2e0d"; + hash = "sha256-Kl5LkdMcUtQAkx/hWvAjebvaptcURfDzOe5oMyBqY4I="; }; passthru.updateScript = unstableGitUpdater { # only "latest" tag pointing at HEAD From ee06f8c8ddeb1a84eab828f7f28b1b11a90eff9e Mon Sep 17 00:00:00 2001 From: William Edwards Date: Mon, 2 Mar 2026 16:18:43 -0800 Subject: [PATCH 21/28] opengamepadui: 0.44.2 -> 0.44.3 --- pkgs/by-name/op/opengamepadui/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 9a6a026f4aad..9d2adbe40ac6 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -4,7 +4,7 @@ dbus, fetchFromGitHub, gamescope, - godot_4_5, + godot_4_6, hwdata, lib, libGL, @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.44.2"; + version = "0.44.3"; buildType = if withDebug then "debug" else "release"; @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Ch3j9URjf9MsGeH7x5CYojnDFQeLXJqcixcGJeDvT4="; + hash = "sha256-pjg5zIgytS7YxNWAJg46aOYhRG88TbK1906UK5fM3pM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - hash = "sha256-xewyt1KuQ96FNYBKlC9VT7KEDDTUasavTsl+/5WXnU4="; + hash = "sha256-ZccqPWyyhVMenF8tLXQlwC5uKg5o66E5qkeNGAbSs1w="; }; cargoRoot = "extensions"; nativeBuildInputs = [ cargo - godot_4_5 + godot_4_6 pkg-config rustPlatform.cargoSetupHook ]; @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { env = let - versionAndRelease = lib.splitString "-" godot_4_5.version; + versionAndRelease = lib.splitString "-" godot_4_6.version; in { - GODOT = lib.getExe godot_4_5; + GODOT = lib.getExe godot_4_6; GODOT_VERSION = lib.elemAt versionAndRelease 0; GODOT_RELEASE = lib.elemAt versionAndRelease 1; - EXPORT_TEMPLATE = "${godot_4_5.export-template}/share/godot/export_templates"; + EXPORT_TEMPLATE = "${godot_4_6.export-template}/share/godot/export_templates"; BUILD_TYPE = "${finalAttrs.buildType}"; }; From cb1263d018251deb35514240105e8f7b95129e96 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 2 Mar 2026 16:42:21 -0800 Subject: [PATCH 22/28] python3Packages.unstructured-inference: fix build --- .../python-modules/unstructured-inference/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index dc9162b7732a..99a00417a5c2 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -5,13 +5,11 @@ setuptools, # runtime dependencies accelerate, - detectron2, huggingface-hub, layoutparser, onnx, onnxruntime, opencv-python, - paddleocr, python-multipart, rapidfuzz, transformers, @@ -39,6 +37,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ + # Wants >= 4.13.0.90 but the latest release is 4.13.0 + "opencv-python" + ]; + dependencies = [ accelerate huggingface-hub From b7a125d6ce0ff186ed6a829376a5c5f66d5b4eb4 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 2 Mar 2026 16:49:41 -0800 Subject: [PATCH 23/28] python3Packages.unstructured-inference: migrate to finalAttrs --- .../python-modules/unstructured-inference/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index 99a00417a5c2..c177b301f2a1 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -23,7 +23,7 @@ pdf2image, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unstructured-inference"; version = "1.1.7"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RY+acfyAGP2r8axfifQkTSkbwkrZ0u6KvFwds24IkMc="; }; @@ -101,7 +101,7 @@ buildPythonPackage rec { meta = { description = "Hosted model inference code for layout parsing models"; homepage = "https://github.com/Unstructured-IO/unstructured-inference"; - changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; platforms = [ @@ -110,4 +110,4 @@ buildPythonPackage rec { "aarch64-darwin" ]; }; -} +}) From 0e14688ac0512cd961552cd77e78902e60a3e67c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 01:07:18 +0000 Subject: [PATCH 24/28] terraform-providers.hashicorp_awscc: 1.68.0 -> 1.73.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 63010f8b0486..facff2985987 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -508,13 +508,13 @@ "vendorHash": "sha256-ukDTmgzd4aJ2SJ27qofCtagRTWlP9foF/WwrTkmZEI4=" }, "hashicorp_awscc": { - "hash": "sha256-eJ4GiOkohhbuwsKtvoDlUM933F3Fd3b5HMLG3mjHBvA=", + "hash": "sha256-nyHKE0bpu7vbOE8uDwqaFjeAdXeMf324FjPb6stRiFU=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.68.0", + "rev": "v1.73.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-udGQHfLQ/gc73ZhbO7Wko5MUhkeFpIvSGCDgPkYAG38=" + "vendorHash": "sha256-NKuuX63rVjUk/+cqR4o/nWIsyNS2uUrAu/9fG3aWBwc=" }, "hashicorp_azuread": { "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=", From b0fedcad234e914f820e1c63f1227188b9853f63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 02:19:21 +0000 Subject: [PATCH 25/28] lrcsnc: 0.1.2 -> 0.1.3-1 --- pkgs/by-name/lr/lrcsnc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lr/lrcsnc/package.nix b/pkgs/by-name/lr/lrcsnc/package.nix index 11bc0c2905c2..3ebb4c13d0b0 100644 --- a/pkgs/by-name/lr/lrcsnc/package.nix +++ b/pkgs/by-name/lr/lrcsnc/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "lrcsnc"; - version = "0.1.2"; + version = "0.1.3-1"; src = fetchFromGitHub { owner = "Endg4meZer0"; repo = "lrcsnc"; tag = "v${finalAttrs.version}"; - hash = "sha256-U1wq3x9GkwJYoR7jA3EtRcFd6UkMf5UGWuBeG+6DYLY="; + hash = "sha256-/lDOWxPl9Z6LellbbuGMNMhiqQfulKmogQ/KnlGus3g="; }; - vendorHash = "sha256-ww+SXy29woGlb120sj1oGb4MIQJzpBCKGpUKYsYxTMk="; + vendorHash = "sha256-33BiLjmMcPAyd0SEGA24MnaW74L764bcU1A6s1pl3+8="; ldflags = [ "-X lrcsnc/internal/setup.version=${finalAttrs.version}" ]; From a5bbcdba35b31a5357d814dbcd1147eeb0a5cb8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 02:24:13 +0000 Subject: [PATCH 26/28] terraform-providers.grafana_grafana: 4.25.0 -> 4.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bf9885639c57..2f52e322cee8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -472,13 +472,13 @@ "vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws=" }, "grafana_grafana": { - "hash": "sha256-EO18AHTtuchRpHxcXa5shmCpoLR91Ows8doBUTjollI=", + "hash": "sha256-ski6B1mZCILcMM6JBWHx0IelYmx0UdDwPYi13PSgIAo=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.25.0", + "rev": "v4.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5+nBYEAdiyNYsZsWvghciCYixQB3ojRlpSiSdjNWDHY=" + "vendorHash": "sha256-64XspOrtBa97fj9DXUQb6siecDfBQETqKvfwckjzU3c=" }, "gridscale_gridscale": { "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=", From 5b628f68a27d44d0753a6a1e0a443b18a847b8a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Mar 2026 03:33:16 +0000 Subject: [PATCH 27/28] _1password-gui: 8.12.2 -> 8.12.5 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 69de260c1915..0ae0524731ed 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.12.2", + "version": "8.12.5", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.2.x64.tar.gz", - "hash": "sha256-vJ+GwQjlDCn6723q1+/xFUFkN9XjI9/0eCftmYQgS1s=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.5.x64.tar.gz", + "hash": "sha256-oa94KXgl4R/HElxSs8CLI5mvpT/4AYHfvODkGr3itJU=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.2.arm64.tar.gz", - "hash": "sha256-V639cHbGZD/Fvaqa4c5jpei3jF9kNPST8LeYogS4fr8=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.5.arm64.tar.gz", + "hash": "sha256-/y8pU8iXLgKGq2tcIMIiRnO4hiXR6rTPp8jTI43St5g=" } } }, "darwin": { - "version": "8.12.2", + "version": "8.12.5", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.2-x86_64.zip", - "hash": "sha256-IYxOVYoeKBsuDo5pS/LcjFNZsdyUL7Jb1QORj2BEB3Y=" + "url": "https://downloads.1password.com/mac/1Password-8.12.5-x86_64.zip", + "hash": "sha256-jAaCSPpm3T7uC6y0A5BF821Q050f/P00kWlvYa0Hn5s=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.2-aarch64.zip", - "hash": "sha256-Z4h2E8dCNA1O+SZGtguueZ36mHbJ11yxMSYiNTpM25U=" + "url": "https://downloads.1password.com/mac/1Password-8.12.5-aarch64.zip", + "hash": "sha256-G4IOVxfaEyzhe74e/IbNt2TSPAgNcF1wri/Pbi4Xr7I=" } } } From 51666aeec351d1d57c5513e3d306458079b249aa Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Mon, 2 Mar 2026 19:42:40 -0800 Subject: [PATCH 28/28] ncps: disable integration tests The integration tests, albeit quite useful, can be flaky on slow and/or busy systems (since they rely on wall clock to pass). For that reason, I will disable them in nixpkgs and leave upstream to deal with testing it. --- pkgs/by-name/nc/ncps/package.nix | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index 53e5602d51ca..61150c7b82c6 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -6,14 +6,9 @@ jq, lib, makeWrapper, - mariadb, - minio, - minio-client, nix-update-script, nixosTests, - postgresql, python3, - redis, writeShellScriptBin, xz, }: @@ -44,16 +39,7 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ makeWrapper # used for wrapping the binary so it can always find the xz binary - - curl # used for checking MinIO health check dbmate # used for testing - jq # used for testing by the init-minio - mariadb # MySQL/MariaDB for integration tests - minio # S3-compatible storage for integration tests - minio-client # mc CLI for MinIO setup - postgresql # PostgreSQL for integration tests - python3 # used for generating the ports - redis # Redis for distributed locking integration tests ]; postInstall = '' @@ -78,23 +64,6 @@ buildGoModule (finalAttrs: { checkFlags = [ "-race" ]; - # pre and post checks - preCheck = '' - # Set up cleanup trap to ensure background processes are killed even if tests fail - cleanup() { - source $src/nix/packages/ncps/post-check-minio.sh - source $src/nix/packages/ncps/post-check-mysql.sh - source $src/nix/packages/ncps/post-check-postgres.sh - source $src/nix/packages/ncps/post-check-redis.sh - } - trap cleanup EXIT - - source $src/nix/packages/ncps/pre-check-minio.sh - source $src/nix/packages/ncps/pre-check-mysql.sh - source $src/nix/packages/ncps/pre-check-postgres.sh - source $src/nix/packages/ncps/pre-check-redis.sh - ''; - passthru = { dbmate-wrapper = buildGoModule { pname = "ncps-dbmate-wrapper";