Skip to content

Commit

Permalink
Merge pull request #49 from vlaci/update_flake_lock_action
Browse files Browse the repository at this point in the history
Update flake.lock
  • Loading branch information
vlaci authored Jun 11, 2024
2 parents 4224260 + d0bf1a6 commit a61d725
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
arch: x86_64-linux
- os: ubuntu-latest
arch: aarch64-linux
- os: macos-latest
- os: macos-12
arch: x86_64-darwin
name: Build Nix - ${{ matrix.arch }}.${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
MacOS:
needs: [Nix]
runs-on: macos-latest
runs-on: macos-12
env:
MACOSX_DEPLOYMENT_TARGET: "10.9"
strategy:
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

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

22 changes: 12 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
liblzallright-coverage = craneLibLLvmTools.cargoLlvmCov (commonArgs // {
inherit cargoArtifacts;
cargoLlvmCovExtraArgs = "--ignore-filename-regex /nix/store --codecov --output-path $out";

env.RUSTFLAGS = "-Z linker-features=-lld";
});

# Run tests with cargo-nextest
Expand Down Expand Up @@ -105,16 +107,16 @@
in
{
default = pkgs.mkShell {
inputsFrom = builtins.attrValues self.checks.${system};

# Extra inputs can be added here
nativeBuildInputs = with pkgs;
[
maturin
pdm
cargo-msrv
];
};
inputsFrom = builtins.attrValues self.checks.${system};

# Extra inputs can be added here
nativeBuildInputs = with pkgs;
[
maturin
pdm
cargo-msrv
];
};
});

formatter = forAllSystems (system: nixpkgsFor.${system}.nixpkgs-fmt);
Expand Down

0 comments on commit a61d725

Please sign in to comment.