diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 356b6ef2a6c7..ca4c63e77d41 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15345,6 +15345,13 @@ githubId = 231780064; name = "Klea"; }; + kleiner3 = { + name = "kleiner3"; + email = "nixos@dasriley.de"; + github = "kleiner3"; + githubId = 49880817; + matrix = "@riley:catgirl.industries"; + }; klntsky = { email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; @@ -26725,6 +26732,11 @@ github = "shimunn"; githubId = 41011289; }; + shinbunbun = { + name = "shinbunbun"; + github = "shinbunbun"; + githubId = 34409044; + }; shiphan = { email = "timlin940511@gmail.com"; name = "Shiphan"; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index c0c9169150de..26a2ab83da50 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -332,6 +332,41 @@ - The `shell_interact()` function on interactive runs of NixOS VM tests has been deprecated. Use the SSH backdoor instead. +- The {option}`programs.fish.shellFunctions` option can now be used to create custom fish functions in a structured manner, as opposed to concatenating strings with {option}`program.fish.interactiveShellInit`. +:::{.example} +# Migrating fish functions to `programs.fish.shellFunctions` + +Custom fish functions have historically been defined like so: + +```nix +{ + programs.fish.interactiveShellInit = '' + function backup --argument filename --description "Creates a backup copy of a file in the current directory." + cp $filename $filename.bak + end + ''; +} +``` + +The above example can be migrated via the following structured code block: + +```nix +{ + programs.fish.shellFunctions = { + backup = { + modifiers = { + description = "Creates a backup copy of a file in the current directory."; + argument = "filename"; + }; + body = '' + cp $filename $filename.bak + ''; + }; + }; +} +``` +::: + - NixOS VM tests now prefer to express durations and timeouts as `datetime.timedelta` values instead of bare numbers. Methods such as `machine.wait_until_succeeds`, `machine.sleep`, `retry`, and `polling_condition` now accept a `timedelta` (e.g., `machine.wait_for_unit("sshd.service", timeout=datetime.timedelta(minutes=1))`). Passing an `int`/`float` as seconds still works but now emits a deprecation warning. Argument names that explicitly defined units were preserved but have had `timedelta` equivalents introduced (`timeout_seconds` → `timeout`, `secs` → `duration`, `seconds_interval` → `interval`). - `darwin.linux-builder-vz` has been added: a variant of `darwin.linux-builder` that runs the builder guest on Apple's Virtualization.framework via the new `vzvm` package, translating `x86_64-linux` builds with Rosetta instead of emulating them. Apple silicon hosts only. As part of this, the `nixos/modules/profiles/nix-builder-vm.nix` profile has been split into the backend-neutral `nixos/modules/profiles/nix-builder.nix` and a QEMU-specific part. Existing imports of `nix-builder-vm.nix` keep working unchanged. diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index cd6450de564b..cff3f6205861 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild (finalAttrs: { pname = "ebuild-mode"; - version = "1.85"; + version = "1.86"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-LSXDf4LHqk8+ga36BIQ+LHIaJQRpen293di1rNrMunE="; + hash = "sha256-wuUZce+9VE5pthm6QPrPJFUGML6Tuv2mnY9cqkSFZo8="; }; meta = { diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index e521bc061e8e..f5d13b5b1e14 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -10,16 +10,16 @@ buildNpmPackage (finalAttrs: { pname = "codex-acp"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "codex-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-GIMJm+kifPEMb7XLPSssUu87eEE+aaBr2jZUk8aPD2s="; + hash = "sha256-lVsj8RqE8XwCblOBSk3B4Nckx4h1o1BHMRrmpkhrIEw="; }; - npmDepsHash = "sha256-BeRj6LpIpGV4ONEHE//nYXTfkB1nfVQpPeJF3LRlyRM="; + npmDepsHash = "sha256-jXXvfg2bPZlvkNBZUw3ptpoOy9wOcvl2B8J0HnpX79c="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 26eff83c1435..77ba28ff559a 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -2,13 +2,14 @@ lib, stdenv, fetchurl, - jdk21_headless, + jdk25_headless, makeWrapper, git, gnused, gnugrep, gawk, which, + versionCheckHook, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -24,10 +25,6 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = [ - jdk21_headless - ]; - runtimeDeps = [ git gnused @@ -45,13 +42,17 @@ stdenv.mkDerivation (finalAttrs: { cp $src $out/share/java/copybara.jar mkdir -p $out/bin - makeWrapper ${jdk21_headless}/bin/java $out/bin/copybara \ + makeWrapper ${jdk25_headless}/bin/java $out/bin/copybara \ --add-flags "-jar $out/share/java/copybara.jar" \ --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} runHook postInstall ''; + doInstallCheck = !stdenv.hostPlatform.isDarwin; + versionCheckProgramArg = "version"; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = { @@ -69,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/google/copybara"; changelog = "https://github.com/google/copybara/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = [ ]; - platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ shinbunbun ]; + inherit (jdk25_headless.meta) platforms; mainProgram = "copybara"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/ev/evolis-card-printer/package.nix b/pkgs/by-name/ev/evolis-card-printer/package.nix new file mode 100644 index 000000000000..9b5bc3b5f6df --- /dev/null +++ b/pkgs/by-name/ev/evolis-card-printer/package.nix @@ -0,0 +1,51 @@ +{ + stdenv, + fetchurl, + + lib, + cups, + dpkg, + autoPatchelfHook, +}: + +stdenv.mkDerivation { + pname = "evolis-card-printer"; + version = "4.12.8"; # driver version + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + # archive.org used as mirror as evolis does not provide simple download links + # original copies can be optained at https://myplace.evolis.com/s/product/pebble-4/01t5p00000CXScZAAX?language=en_US&tabset-100fe=2 + # deb drivers have weird problems described on archive.org page + # TLDR: use portrait as landscape and vice versa + + url = "https://archive.org/download/evolisprinter-4.12.8.8/64%20bit%20version%20-%20evolisprinter-4.12.8.8.amd64.deb"; + hash = "sha256-xldAk9FunkIcStu6hAS6onlRS3JdWIVftkbj8Bxtx8c="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + cups + ]; + + installPhase = '' + runHook preInstall + cp -r usr $out + runHook postInstall + ''; + + meta = { + description = "Evolis printer drivers, for Pebble, Badgy, Dualys, Primacy, Quantum, Securion, Tattoo, Tatoo2 and Zenus card printers"; + homepage = "https://myplace.evolis.com/s/product/pebble-4/01t5p00000CXScZAAX?language=en_US&tabset-100fe=2"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + kleiner3 + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index c18e8c656407..4c91deefc4cd 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.18.1"; + version = "1.18.4"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - hash = "sha256-vGg/yRbtIcBSS7Bk81jCrBhYa47IjHby9/KJh3UhYxw="; + hash = "sha256-uJmnoAxI0sYmy47DP+VWcgs3bCWAXXIiQwwP3KTGrI0="; }; patches = [ @@ -288,7 +288,7 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; }; meta = { diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 2a8ffea396f5..ba5ed685264c 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -1,23 +1,23 @@ { lib, fetchFromGitHub, - buildGoModule, + buildGo127Module, versionCheckHook, writableTmpDirAsHomeHook, }: -buildGoModule (finalAttrs: { +buildGo127Module (finalAttrs: { pname = "gh-dash"; - version = "4.25.2"; + version = "4.26.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${finalAttrs.version}"; - hash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU="; + hash = "sha256-NWJEe6ocC1FdXNLLGgVAcWlzjWqtgrMLnpnJrgbR7U4="; }; - vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk="; + vendorHash = "sha256-edFzZpM1DIwFnMLQlOuh5c8CFzYm3X2YheGFDgOLZ0I="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix index c1e30e4fd9e5..230e28e90455 100644 --- a/pkgs/by-name/go/golines/package.nix +++ b/pkgs/by-name/go/golines/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "golines"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golines"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-gjm76dGbFTisQdiM0GAQJRcAreQUWIBuqYbLU2ruCNk="; + sha256 = "sha256-NveivuTEy+lvgsu32YuBE9lHhV4aTcI04BkMlZiIEGw="; }; - vendorHash = "sha256-cLzCpjifb0lc6UaDW2JZBQABixz98EJ4syLapX7I8y8="; + vendorHash = "sha256-bn4C1d7EdAfBJZkWJByOQns+ng7F15eUs8BgYExB/g8="; subPackages = [ "." diff --git a/pkgs/by-name/in/inter/package.nix b/pkgs/by-name/in/inter/package.nix index 1378a93ff670..d633128504c1 100644 --- a/pkgs/by-name/in/inter/package.nix +++ b/pkgs/by-name/in/inter/package.nix @@ -4,12 +4,12 @@ fetchzip, installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "inter"; version = "4.1"; src = fetchzip { - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + url = "https://github.com/rsms/inter/releases/download/v${finalAttrs.version}/Inter-${finalAttrs.version}.zip"; stripRoot = false; hash = "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ="; }; @@ -21,6 +21,8 @@ stdenvNoCC.mkDerivation rec { dontInstallWebfonts = true; + __structuredAttrs = true; + meta = { homepage = "https://rsms.me/inter/"; description = "Typeface specially designed for user interfaces"; @@ -28,4 +30,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ demize ]; }; -} +}) diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix index 01ad70b02fc2..038b658cdf69 100644 --- a/pkgs/by-name/kb/kbld/package.nix +++ b/pkgs/by-name/kb/kbld/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "kbld"; - version = "0.47.3"; + version = "0.49.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kbld"; rev = "v${finalAttrs.version}"; - hash = "sha256-BuISF6PmtFPHTYmByJ021WICGXVVc+ZNjxeb40J7exA="; + hash = "sha256-YjyBuB/CG/ocPOl2/P9fpXa1JTJPnRR5uRLyMbLrIJg="; }; vendorHash = null; diff --git a/pkgs/by-name/mo/moka-icon-theme/package.nix b/pkgs/by-name/mo/moka-icon-theme/package.nix index 6ce987e42127..fe57299b97e0 100644 --- a/pkgs/by-name/mo/moka-icon-theme/package.nix +++ b/pkgs/by-name/mo/moka-icon-theme/package.nix @@ -13,13 +13,16 @@ stdenvNoCC.mkDerivation { pname = "moka-icon-theme"; - version = "unstable-2019-05-29"; + version = "5.4.0-unstable-2019-05-30"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "snwh"; repo = "moka-icon-theme"; rev = "c0355ea31e5cfdb6b44d8108f602d66817546a09"; - sha256 = "0m4kfarkl94wdhsds2q1l9x5hfa9l3117l8j6j7qm7sf7yzr90c8"; + hash = "sha256-iIGUvz9On4qPNBLRE8KgSTlYeqIBC900bJwkOrNyk1Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 16821a0fd79e..8b3cecc71167 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "netclient"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${finalAttrs.version}"; - hash = "sha256-3vljlrWmetQfAwemRsC76e7DqlFVQKxnV1mpx/NtYvc="; + hash = "sha256-OgCKcfNU0AKAbe+jrmLZ9o7J7xYxIYxcLfdtN6yYEfg="; }; - vendorHash = "sha256-fnXekqGK1c6pf8UY1F44RYbU+wc9kZJQg3hmRPcBFCE="; + vendorHash = "sha256-SAJkeuDEVOqNDAUTY8ywSrnbq/lPYIbLtLGGGk882TM="; buildInputs = lib.optional stdenv.hostPlatform.isLinux libx11; diff --git a/pkgs/by-name/ob/objdiff/package.nix b/pkgs/by-name/ob/objdiff/package.nix index 9d1e71f66cba..2deb843cda5a 100644 --- a/pkgs/by-name/ob/objdiff/package.nix +++ b/pkgs/by-name/ob/objdiff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "objdiff"; - version = "3.8.0"; + version = "3.8.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "encounter"; repo = "objdiff"; tag = "v${finalAttrs.version}"; - hash = "sha256-DuU7NJJSIPoePNrG6HH/IEmJtUEio7067jQNDOPX7nA="; + hash = "sha256-zLf2vElF39HrCWbq++3ytU9vIO+G5d/vUwJj1Z8asGk="; }; - cargoHash = "sha256-ckF4N4GqdQxInLrmpTBgh2bdtMjFbmkjZzEZUUpxhbs="; + cargoHash = "sha256-5LE5g8KgOxIBt6lTnn2m8wvfNj2T4Ap06jLVeSo2feQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/op/open-websearch/package.nix b/pkgs/by-name/op/open-websearch/package.nix index a90c445b1761..a7249417cef8 100644 --- a/pkgs/by-name/op/open-websearch/package.nix +++ b/pkgs/by-name/op/open-websearch/package.nix @@ -5,7 +5,7 @@ }: buildNpmPackage (finalAttrs: { pname = "open-websearch"; - version = "2.1.9"; + version = "2.2.0"; __structuredAttrs = true; strictDeps = true; @@ -14,10 +14,10 @@ buildNpmPackage (finalAttrs: { owner = "Aas-ee"; repo = "open-webSearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZS56Eoy9IePLeyopv4AK6FU8+b1E8r/WPK6RYDvy6yA="; + hash = "sha256-5Hf1e3AgSC0brQqMqAbTt718ly1Ms5GoV0JuDAE1BCc="; }; - npmDepsHash = "sha256-Ua20YOYr/D06eMQsgBgfN/W7F74wfjjHXL10XIB0nFA="; + npmDepsHash = "sha256-fcRKZroEokDjEY1xiIu5kOqthIK0zx6ZnjpWMkzyIj0="; meta = { description = "Web search MCP server"; diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix index 5188c3bcc6da..530f2d05ad9a 100644 --- a/pkgs/by-name/re/redis-plus-plus/package.nix +++ b/pkgs/by-name/re/redis-plus-plus/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, hiredis, enableShared ? !stdenv.hostPlatform.isStatic, @@ -24,6 +25,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-Fix-pkg-config-paths.patch + + # https://github.com/sewenew/redis-plus-plus/issues/678 + (fetchpatch2 { + name = "walk-around-gcc-16-bug.patch"; + url = "https://github.com/sewenew/redis-plus-plus/commit/4b4cd0dc2931e96842ef05e165673b8679e32f48.patch?full_index=1"; + hash = "sha256-neZj/J9nRg3Ft/+wQcRzvTjwm41odNnEfHnrs8/KiL4="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/te/terraform/package.nix b/pkgs/by-name/te/terraform/package.nix index de82b4783f6f..ba5ea23b5289 100644 --- a/pkgs/by-name/te/terraform/package.nix +++ b/pkgs/by-name/te/terraform/package.nix @@ -15,16 +15,16 @@ let package = buildGo127Module rec { pname = "terraform"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; rev = "v${version}"; - hash = "sha256-XfVzSAMx/Y/gqDSXkRtGupGQB0ytBp907zHcsA0IUKw="; + hash = "sha256-RfN/uQryR+mA2OYhWvaFvwK+63+LN9iZ7PoLj0YSA90="; }; - vendorHash = "sha256-e3j9PSptoqUV+/CQWLcy3/0E9qhdWbXUe3f+ZB5WsHI="; + vendorHash = "sha256-1NR5xhfZrHvG8VUwAJMgKCRvfs2AA8y5KPB/IYQiQB0="; patches = [ ./provider-path-0_15.patch ]; diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 3dbb8f032bd4..552287e18488 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "tfswitch"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4a7noh05dA0alPnOtkDTFHynfwtf0MR74NNptgLGdKI="; + sha256 = "sha256-L6k3Hf9A9hL6+rlAvqCEIypSNSkAFUcDUlzvUKsby84="; }; - vendorHash = "sha256-wUWEGRyF6gyitTBfEcEsylczI/uTMfgI4gx/N91n08w="; + vendorHash = "sha256-KEFg4sncUvNBhjEnuj/FG3jyGQvEZq4eucl5aGuwYOk="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 252d27c74980..e4cfee8a071c 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tpnote"; - version = "1.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${finalAttrs.version}"; - hash = "sha256-SfgsD/vvSPTRZQx7ZEJ5qOvCE+BUsplaZUhYidg+DvA="; + hash = "sha256-Wm4t28AHghn1H/zr7mMaEH74YpxdnztQWgDFMmZ5kQo="; }; - cargoHash = "sha256-SVWp0BHAfR9KRrk3tBzt0XeybXPDu89E1nQ9io+RWIg="; + cargoHash = "sha256-tDO2FRbXwKT74cpF8oxomgLc97o0jljwgwUhANYujrg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/uu/uutils-sed/package.nix b/pkgs/by-name/uu/uutils-sed/package.nix index c89ac96235db..835c6cba4d30 100644 --- a/pkgs/by-name/uu/uutils-sed/package.nix +++ b/pkgs/by-name/uu/uutils-sed/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-sed"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "uutils"; repo = "sed"; tag = finalAttrs.version; - hash = "sha256-y1X9nj/quBtisp+6MHFjVKFHrdFnujWTxLWNLvdrADA="; + hash = "sha256-KBeZcVFFoiMblonSvtfA9I9udYj9VP5NtjbcLvhQchM="; }; - cargoHash = "sha256-N5wwNPjOL3U4bPSONGpjmOBU31Nt/sCVth+JH3xmz/g="; + cargoHash = "sha256-5Zo9IvIAjwzW7QY4YDxUN8+Fudz9xhQiwPMuXZ8wx/A="; meta = { changelog = "https://github.com/uutils/sed/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/compilers/gcc/patches/13/gnat13-aarch64-darwin-trampoline.patch b/pkgs/development/compilers/gcc/patches/13/gnat13-aarch64-darwin-trampoline.patch index 2065a90d136a..6e14d0ba2f52 100644 --- a/pkgs/development/compilers/gcc/patches/13/gnat13-aarch64-darwin-trampoline.patch +++ b/pkgs/development/compilers/gcc/patches/13/gnat13-aarch64-darwin-trampoline.patch @@ -1,4 +1,4 @@ -From a41f0707bdcc9fb6dab39eb8ce7e392138d16dc0 Mon Sep 17 00:00:00 2001 +From 0089a264f255fbbb5476df2b65a783d595cc9dde Mon Sep 17 00:00:00 2001 From: zinzilulo <214774502+zinzilulo@users.noreply.github.com> Date: Wed, 27 May 2026 18:25:14 +0100 Subject: [PATCH] Allow GNAT 13 bootstrap on aarch64-darwin with nested @@ -19,14 +19,13 @@ between the Alire/GNAT-FSF-build GNAT 13.2.0-2 compiler and the IainS/gcc-13-branch 13.4-darwin-r0 source tree. --- gcc/builtins.def | 4 ++-- - gcc/config/darwin.h | 8 ++++---- gcc/doc/invoke.texi | 4 ++-- gcc/tree.cc | 8 ++++---- libgcc/config/aarch64/heap-trampoline.c | 8 ++++---- libgcc/config/i386/heap-trampoline.c | 8 ++++---- libgcc/libgcc-std.ver.in | 4 ++-- libgcc/libgcc2.h | 4 ++-- - 8 files changed, 24 insertions(+), 24 deletions(-) + 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gcc/builtins.def b/gcc/builtins.def index 448cf837ec8..5bf4769ae47 100644 @@ -43,30 +42,11 @@ index 448cf837ec8..5bf4769ae47 100644 /* Implementing __builtin_setjmp. */ DEF_BUILTIN_STUB (BUILT_IN_SETJMP_SETUP, "__builtin_setjmp_setup") -diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h -index 0cc6f021365..47bca6f1db1 100644 ---- a/gcc/config/darwin.h -+++ b/gcc/config/darwin.h -@@ -433,10 +433,10 @@ extern GTY(()) int darwin_ms_struct; - ___emutls_get_address -exported_symbol ___emutls_get_address \ - -U ___emutls_register_common \ - -exported_symbol ___emutls_register_common \ -- -U ___gcc_nested_func_ptr_created \ -- -exported_symbol ___gcc_nested_func_ptr_created \ -- -U ___gcc_nested_func_ptr_deleted \ -- -exported_symbol ___gcc_nested_func_ptr_deleted \ -+ -U ___builtin_nested_func_ptr_created \ -+ -exported_symbol ___builtin_nested_func_ptr_created \ -+ -U ___builtin_nested_func_ptr_deleted \ -+ -exported_symbol ___builtin_nested_func_ptr_deleted \ - }} \ - }}}\ - %{!r:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} "\ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 8f82ba0ecfa..4d5bba42fcd 100644 +index 5607481acb9..b36e95efa2b 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -18718,8 +18718,8 @@ for nested functions. +@@ -18722,8 +18722,8 @@ for nested functions. By default, trampolines are generated on stack. However, certain platforms (such as the Apple M1) do not permit an executable stack. Compiling with @option{-ftrampoline-impl=heap} generate calls to @@ -78,10 +58,10 @@ index 8f82ba0ecfa..4d5bba42fcd 100644 implemented in libgcc, and will only be provided on specific targets: x86_64 Darwin, x86_64 and aarch64 Linux. @emph{PLEASE NOTE}: Heap diff --git a/gcc/tree.cc b/gcc/tree.cc -index 032b87ee1c8..54abc791c88 100644 +index 806dd0ef8ae..701a6fbb39f 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc -@@ -9874,17 +9874,17 @@ build_common_builtin_nodes (void) +@@ -9888,17 +9888,17 @@ build_common_builtin_nodes (void) ptr_type_node, // void *func ptr_ptr_type_node, // void **dst NULL_TREE); @@ -198,5 +178,5 @@ index a7a5dff0184..ac7eaab4f01 100644 extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t); extern void __clear_cache (void *, void *); -- -2.50.1 (Apple Git-155) +2.55.0 diff --git a/pkgs/development/python-modules/mlx-vlm/default.nix b/pkgs/development/python-modules/mlx-vlm/default.nix index 7c97f38f7267..62375d7a6a56 100644 --- a/pkgs/development/python-modules/mlx-vlm/default.nix +++ b/pkgs/development/python-modules/mlx-vlm/default.nix @@ -96,5 +96,6 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + broken = true; }; }) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index ee9a3195b4a8..911ff6789118 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -27,6 +27,7 @@ numpy, pytestCheckHook, python, + sysctl, }: let @@ -41,7 +42,7 @@ let in buildPythonPackage (finalAttrs: { pname = "mlx"; - version = "0.32.0"; + version = "0.32.1"; pyproject = true; __structuredAttrs = true; @@ -49,7 +50,7 @@ buildPythonPackage (finalAttrs: { owner = "ml-explore"; repo = "mlx"; tag = "v${finalAttrs.version}"; - hash = "sha256-yHpTyRf9FOPbdyDWSM7b6VC72STnUpgCMLbDxLbdaqs="; + hash = "sha256-VstsaBOAvqHJhTNXczjFavG4l5VTJdJWT0VKuzmwIEA="; }; patches = [ @@ -106,6 +107,7 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ numpy pytestCheckHook + sysctl ]; enabledTestPaths = [ diff --git a/pkgs/development/python-modules/otcextensions/default.nix b/pkgs/development/python-modules/otcextensions/default.nix index d8ef6ce8f48c..a2e9094e752b 100644 --- a/pkgs/development/python-modules/otcextensions/default.nix +++ b/pkgs/development/python-modules/otcextensions/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "otcextensions"; - version = "0.34.7"; + version = "0.34.8"; pyproject = true; src = fetchFromGitHub { owner = "opentelekomcloud"; repo = "python-otcextensions"; tag = version; - hash = "sha256-VOBeSAoHTqKjoWno16+aHOOfbst2wUjtAqz7MvGRT6U="; + hash = "sha256-dkAF0UXD0cpktSqDsYbpHO8IzKRdHx85MOp4aelbbgo="; }; env.PBR_VERSION = version;