Skip to content

Commit 2532ff7

Browse files
committed
chore: disable cargo-llvm-cov on flake shell (marked as broken); unify nixpkgs inputs (follows); bump flake
1 parent 375bdaa commit 2532ff7

File tree

2 files changed

+30
-51
lines changed

2 files changed

+30
-51
lines changed

flake.lock

Lines changed: 15 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33

44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
6+
67
flake-utils.url = "github:numtide/flake-utils";
8+
79
rust-overlay.url = "github:oxalica/rust-overlay";
10+
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
11+
812
pre-commit-hooks.url = "github:cachix/git-hooks.nix";
13+
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
914
};
1015

1116
outputs = { self, nixpkgs, rust-overlay, pre-commit-hooks, flake-utils, ... }:
@@ -21,11 +26,12 @@
2126
rocksdb
2227
zstd.dev
2328
];
24-
buildInputs = if pkgs.stdenv.isLinux then
25-
generalBuildInputs ++ [ pkgs.jemalloc pkgs.pkgsi686Linux.glibc ]
26-
else
27-
generalBuildInputs
28-
++ [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ];
29+
buildInputs =
30+
if pkgs.stdenv.isLinux then
31+
generalBuildInputs ++ [ pkgs.jemalloc pkgs.pkgsi686Linux.glibc ]
32+
else
33+
generalBuildInputs
34+
++ [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ];
2935
nativeBuildInputs = with pkgs; [ git rust clang protobuf sccache ];
3036

3137
shellPkgs = [
@@ -36,10 +42,11 @@
3642
pkgs.act
3743
# Python
3844
pkgs.python310
39-
# Code coverage tool
40-
pkgs.cargo-llvm-cov
45+
# # Code coverage tool
46+
# pkgs.cargo-llvm-cov # marked as broken
4147
];
42-
in {
48+
in
49+
{
4350
checks = pkgs.mkShell {
4451
pre-commit-check = pre-commit-hooks.lib.${system}.run {
4552
src = ./.;

0 commit comments

Comments
 (0)