diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index aaa37968bd633..c0262c04c8299 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -73,6 +73,9 @@ - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. +- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes. + Like upstream's docker images, renovate now runs on NodeJS 22. + - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. @@ -114,6 +117,9 @@ [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. +- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). + `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix new file mode 100644 index 0000000000000..cdb819e0fc73a --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -0,0 +1,87 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + openssl, + pkg-config, + rustPlatform, + stdenv, + vimPlugins, + vimUtils, +}: +let + version = "0.0.12"; + src = fetchFromGitHub { + owner = "yetone"; + repo = "avante.nvim"; + tag = "v${version}"; + hash = "sha256-yFHX9WCdTBtFZ2Yhy542Rg9nyIu6IWyRjKkS+ojZsdM="; + }; + avante-nvim-lib = rustPlatform.buildRustPackage { + pname = "avante-nvim-lib"; + inherit version src; + + cargoHash = "sha256-n0+UT9wYnmPDOX2LKWztURqYLy2oa8sUeQLycR3/Zr0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + buildFeatures = [ "luajit" ]; + + checkFlags = [ + # Disabled because they access the network. + "--skip=test_hf" + "--skip=test_public_url" + "--skip=test_roundtrip" + ]; + }; +in +vimUtils.buildVimPlugin { + pname = "avante-nvim"; + inherit version src; + + dependencies = with vimPlugins; [ + dressing-nvim + nui-nvim + nvim-treesitter + plenary-nvim + ]; + + postInstall = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + mkdir -p $out/build + ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} + ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} + ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = "vimPlugins.avante-nvim.avante-nvim-lib"; + }; + + # needed for the update script + inherit avante-nvim-lib; + }; + + doInstallCheck = true; + nvimRequireCheck = "avante"; + + meta = { + description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; + homepage = "https://github.com/yetone/avante.nvim"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + ttrei + aarnphm + ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a0201813fcb83..8f5c998f7c81b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1025,18 +1025,6 @@ final: prev: meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; }; - avante-nvim = buildVimPlugin { - pname = "avante.nvim"; - version = "2024-12-05"; - src = fetchFromGitHub { - owner = "yetone"; - repo = "avante.nvim"; - rev = "4464b7f4ae26254cd506a354284a02129941e244"; - sha256 = "0h1l3d332hh3gbdwydmm5wpswfzcl7w9j0bx6g6xnazya5cpzc3s"; - }; - meta.homepage = "https://github.com/yetone/avante.nvim/"; - }; - aw-watcher-vim = buildVimPlugin { pname = "aw-watcher-vim"; version = "2023-10-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 556ba8f63da41..a820a83658b60 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -197,66 +197,7 @@ in ]; }; - avante-nvim = super.avante-nvim.overrideAttrs ( - oldAttrs: - let - avante-nvim-lib = rustPlatform.buildRustPackage { - pname = "avante-nvim-lib"; - inherit (oldAttrs) version src; - - cargoHash = "sha256-kbgJlvYtL69i6br5jQ9QiCXEQuOWiHRDFWAofyKJb2s="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ]; - - buildFeatures = [ "luajit" ]; - - checkFlags = [ - # Disabled because they access the network. - "--skip=test_hf" - "--skip=test_public_url" - "--skip=test_roundtrip" - ]; - }; - in - { - dependencies = with self; [ - dressing-nvim - nui-nvim - nvim-treesitter - plenary-nvim - ]; - - postInstall = - let - ext = stdenv.hostPlatform.extensions.sharedLibrary; - in - '' - mkdir -p $out/build - ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} - ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} - ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} - ''; - - doInstallCheck = true; - nvimRequireCheck = "avante"; - - meta = { - description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; - homepage = "https://github.com/yetone/avante.nvim"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - ttrei - aarnphm - ]; - }; - } - ); + avante-nvim = callPackage ./avante-nvim { }; aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { patches = [ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d1abe9f7735c8..c09a939083c22 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -84,7 +84,6 @@ https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/gaoDean/autolist.nvim/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/nullishamy/autosave.nvim/,HEAD, -https://github.com/yetone/avante.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/AhmedAbdulrahman/aylin.vim/,, https://github.com/ayu-theme/ayu-vim/,, diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 33896a852698e..8d3450b30f603 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6872"; + version = "6886"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-JhAW1Ot4ncLiEz/Y83D/capJ+H46GybYnWHpMChX6F0="; - aarch64-linux = "sha256-/8o+v8fIXYK8N7xdC14/fWk3LOr13xyjadMXJgploek="; - x86_64-darwin = "sha256-nVu3JhvjnqhCpNDSBzzZA1PHbT2y5b+kEeu4ZPqgf4Q="; - aarch64-darwin = "sha256-IyoeuNno+Y8nLi1u9tjl75ZJiULrnKyShe3oaSY9GF4="; + x86_64-linux = "sha256-8o2PgbyHqU1ST2clx2NRB6/E1eBWjuyx2oIVvc1/ujI="; + aarch64-linux = "sha256-SUxtX7NMK+sMi5Fybc2P+bNrXET0TTBJTUhsMw0eBTc="; + x86_64-darwin = "sha256-p4lHxr1Do3pLKXn2bOt8gh2R5KHPr4HpAM9hphFUimU="; + aarch64-darwin = "sha256-Eb9I17GcuBaMAVKI9K0Rf/iD+nhBFDgYhWth46yU0xE="; }; in fetchzip { diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 2d47c1e879491..c772d0460fad9 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -11,6 +11,7 @@ xcbuild, nixosTests, nix-update-script, + yq-go, }: let @@ -20,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.105.2"; + version = "39.42.4"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-gF8bxzNF1AUJJDxFdNfa+sr/TP0S4uLCXyu3tjRuBjc="; + tag = finalAttrs.version; + hash = "sha256-M1QzvYMrs39ELc2tkazwDPbCPHqfqzde2hbMvg34m0A="; }; postPatch = '' @@ -39,11 +40,12 @@ stdenv'.mkDerivation (finalAttrs: { nodejs pnpm_9.configHook python3 + yq-go ] ++ lib.optional stdenv'.hostPlatform.isDarwin xcbuild; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-AdNleEe1wVBfhhoM6xit06ql1xEz/TLhZ7qpofwQ874="; + hash = "sha256-14E1v2HLFdbkxFnSPQnuwb+zyPXaczAp1Ab0EC65luc="; }; env.COREPACK_ENABLE_STRICT = 0; @@ -52,6 +54,9 @@ stdenv'.mkDerivation (finalAttrs: { '' runHook preBuild + # relax nodejs version + yq '.engines.node = "${nodejs.version}"' -i package.json + pnpm build pnpm prune --prod --ignore-scripts '' diff --git a/pkgs/by-name/zf/zf/deps.nix b/pkgs/by-name/zf/zf/deps.nix index c814bd6c96457..7eeea9754d85a 100644 --- a/pkgs/by-name/zf/zf/deps.nix +++ b/pkgs/by-name/zf/zf/deps.nix @@ -1,13 +1,56 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) -{ linkFarm, fetchzip }: +{ + linkFarm, + fetchzip, + fetchgit, +}: linkFarm "zig-packages" [ { - name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25"; + name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40"; path = fetchzip { - url = "https://codeberg.org/dude_the_builder/ziglyph/archive/b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz"; - hash = "sha256-e/zYB9w6vvHUBJzjlocSjpJu3qao7sXjBsfUO9oDXyg="; + url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz"; + hash = "sha256-4yLDdyQwPvglNzcRxlWbptjjOb0fsLv8jg/jFUp/uAU="; + }; + } + { + name = "12207b7a5b538ffb7fb18f954ae17d2f8490b6e3778a9e30564ad82c58ee8da52361"; + path = fetchgit { + url = "https://github.com/mitchellh/libxev"; + rev = "f6a672a78436d8efee1aa847a43a900ad773618b"; + hash = "sha256-NCRu+2UixKsm+tJMQiPyzAYL/kiKn4HFbJq3wpTF34Q="; + }; + } + { + name = "1220a55aedabdd10578d0c514719ea39ae1bc6d7ed990f508dc100db7f0ccf391437"; + path = fetchgit { + url = "https://github.com/Cloudef/zig-aio"; + rev = "b5a407344379508466c5dcbe4c74438a6166e2ca"; + hash = "sha256-OvM4CA2w9v2XpjAV26CjsLIWOILOQm89xaEwitYpciw="; + }; + } + { + name = "1220da4cab188b7b0e351de67626ca0dcadceddd16ca5997cfb578697f0525a59dac"; + path = fetchgit { + url = "https://github.com/marlersoft/zigwin32.git"; + rev = "4a78e716ae6496f52d9ddaf4fda2c4bb692631cd"; + hash = "sha256-/XvkZPxoq2oeEWREX0dDLdVro4NsCBsMHWKcytaD4Rg="; + }; + } + { + name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5"; + path = fetchgit { + url = "https://github.com/zigimg/zigimg"; + rev = "3a667bdb3d7f0955a5a51c8468eac83210c1439e"; + hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo="; + }; + } + { + name = "1220de23a3240e503397ea579de4fd85db422f537e10036ef74717c50164475813ce"; + path = fetchzip { + url = "https://github.com/rockorager/libvaxis/archive/refs/tags/v0.5.1.tar.gz"; + hash = "sha256-F0PSs2k2XzC1J/UTyBetuBdXvIm/6jDWtSLATpnp+QY="; }; } ] diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix index ee10c39dea13e..8f03620b48ec7 100644 --- a/pkgs/by-name/zf/zf/package.nix +++ b/pkgs/by-name/zf/zf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zf"; - version = "0.9.2"; + version = "0.10.2"; src = fetchFromGitHub { owner = "natecraddock"; repo = "zf"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-8KfzsDG9sZ/jMOusz2ydt3oytp891vKOpCUlPAwS8TE="; + hash = "sha256-Rsl8gAfVMeF5CLyPSrtzdgSCvEwPnBwHT4BOF9JQYYo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index d11c806448212..aa9f43a7e4aa5 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "mdx"; - version = "2.4.1"; + version = "2.5.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - hash = "sha256-GkDMkcxVPe0KIMmNQ0NUlTvbdZ7Mka02u7mn3QQSrxM="; + hash = "sha256-wtpY19UYLxXARvsyC7AsFmAtLufLmfNJ4/SEHCY2UCk="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix new file mode 100644 index 0000000000000..c832c29865194 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix @@ -0,0 +1,30 @@ +{ + buildDunePackage, + mirage-crypto, + mirage-crypto-rng, + dune-configurator, + eio, + eio_main, + ohex, +}: + +buildDunePackage rec { + pname = "mirage-crypto-rng-eio"; + + inherit (mirage-crypto) version src; + + doCheck = true; + checkInputs = [ + eio_main + ohex + ]; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + mirage-crypto + mirage-crypto-rng + eio + ]; + + meta = mirage-crypto-rng.meta; +} diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 24c75bf05e816..da2930e541908 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -7,40 +7,28 @@ apr, aprutil, bash, - e2fsprogs, - expat, gcc, - neon, - glibcLocales, - openssl, pycxx, subversion, }: buildPythonPackage rec { pname = "pysvn"; - version = "1.9.22"; - format = "other"; + version = "1.9.23"; + pyproject = false; src = fetchurl { url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; - hash = "sha256-KfLg9tuuKpXxJoniD002kDXGCTwOZ9jurCoPrWMRo7g="; + hash = "sha256-ABru1nng1RaYfZwe0Z0NxE90rU/J2h/BhzUnvgrasCk="; }; patches = [ ./replace-python-first.patch ]; - buildInputs = - [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + buildInputs = [ + subversion + apr + aprutil + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -56,8 +44,6 @@ buildPythonPackage rec { --svn-bin-dir=${subversion.out}/bin ''; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a270cc024f325..49d12a46b5440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10625,6 +10625,10 @@ with pkgs; librdf_redland = callPackage ../development/libraries/librdf/redland.nix { }; redland = librdf_redland; # added 2018-04-25 + renovate = callPackage ../by-name/re/renovate/package.nix { + nodejs = nodejs_22; + }; + qradiolink = callPackage ../applications/radio/qradiolink { protobuf = protobuf_21; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 833d9a91ec607..3431c113c2fb8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1155,6 +1155,8 @@ let mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; + mirage-crypto-rng-eio = callPackage ../development/ocaml-modules/mirage-crypto/rng-eio.nix { }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0148e53ecf78c..7e1e152752f50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12631,7 +12631,7 @@ self: super: with self; { pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; pysvn = callPackage ../development/python-modules/pysvn { - inherit (pkgs) bash subversion apr aprutil expat neon openssl; + inherit (pkgs) bash subversion apr aprutil; }; pyswitchbee = callPackage ../development/python-modules/pyswitchbee { };