Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixel: 4.1.0 -> 5.1.1 + Add Update Script #369124

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions pkgs/by-name/ni/nixel/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,34 @@
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
clang_16,
testers,
nixel,
}:

rustPlatform.buildRustPackage rec {
let
clang = clang_16; # Until bindgen is updated with clang19 support
rustPlatform' = rustPlatform // {
bindgenHook = rustPlatform.bindgenHook.override { inherit clang; };
};
in
rustPlatform'.buildRustPackage rec {
pname = "nixel";
version = "4.1.0";
version = "5.1.1";

src = fetchFromGitHub {
owner = "kamadorueda";
repo = pname;
rev = version;
sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
sha256 = "sha256-wIXZd8iujLqbgbV+abWmIfjDgQ8i6nyE5jTAs3OczXM=";
};

cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY=";
cargoHash = "sha256-GJ2UO8MvujRxFjzdt2Tfrlfzv1jot9XCrmfBqTFVngI=";

nativeBuildInputs = [
# Workaround borrowed here where the same error were observed: https://github.com/NixOS/nixpkgs/issues/331240#issuecomment-2260565324
rustPlatform'.bindgenHook # with override { clang = clang_16; }
];

# Package requires a non reproducible submodule
# https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7
Expand All @@ -27,6 +39,7 @@ rustPlatform.buildRustPackage rec {
passthru.tests = {
version = testers.testVersion { package = nixel; };
};
passthru.updateScript = nix-update-script { };

meta = with lib; {
description = "Lexer, Parser, Abstract Syntax Tree and Concrete Syntax Tree for the Nix Expressions Language";
Expand Down