Skip to content

Commit

Permalink
Merge commit '75d54b468a2a51b38c56aa8d09e33ac38cd732bc' into staging-…
Browse files Browse the repository at this point in the history
…next

The "reformat everything on master/staging/staging-next together"
approach from NixOS#322537 didn't quite
work out: master now can't be automatically merged into staging-next
anymore (same for staging-next into staging).

To resolve this, we're performing two merges:
- This first one to merge the commit on master just before the treewide
  reformat into staging-next
- The following one to merge the treewide reformat commit into
  staging-next, but effectively ignoring all changes from the treewide
  reformat commit
  • Loading branch information
infinisil committed Dec 10, 2024
2 parents 1f6571c + 75d54b4 commit ca3b891
Show file tree
Hide file tree
Showing 15 changed files with 204 additions and 113 deletions.
6 changes: 6 additions & 0 deletions nixos/doc/manual/release-notes/rl-2505.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

## Other Notable Changes {#sec-release-25.05-notable-changes}
Expand Down
87 changes: 87 additions & 0 deletions pkgs/applications/editors/vim/plugins/avante-nvim/default.nix
Original file line number Diff line number Diff line change
@@ -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
];
};
}
12 changes: 0 additions & 12 deletions pkgs/applications/editors/vim/plugins/generated.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
61 changes: 1 addition & 60 deletions pkgs/applications/editors/vim/plugins/overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/editors/vim/plugins/vim-plugin-names
Original file line number Diff line number Diff line change
Expand Up @@ -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/,,
Expand Down
10 changes: 5 additions & 5 deletions pkgs/by-name/pd/pdfium-binaries/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
stdenv,
}:
let
version = "6872";
version = "6886";
src =
let
inherit (stdenv.hostPlatform) system;
Expand All @@ -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 {
Expand Down
13 changes: 9 additions & 4 deletions pkgs/by-name/re/renovate/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
xcbuild,
nixosTests,
nix-update-script,
yq-go,
}:

let
Expand All @@ -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 = ''
Expand All @@ -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;
Expand All @@ -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
''
Expand Down
51 changes: 47 additions & 4 deletions pkgs/by-name/zf/zf/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/by-name/zf/zf/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/mdx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
30 changes: 30 additions & 0 deletions pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix
Original file line number Diff line number Diff line change
@@ -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;
}
Loading

0 comments on commit ca3b891

Please sign in to comment.