mirror of
https://github.com/rosenpass/rosenpass.git
synced 2025-12-05 20:40:02 -08:00
fix: remove fenix flake input
By now it is possible to use cargo-llvm-cov with the nixpkgs built-in llvm tools, thus no need for a nightly rust with the llvm-tools-preview. Therefore, fenix as a dependency is removed. Signed-off-by: wucke13 <wucke13+github@gmail.com>
This commit is contained in:
39
flake.lock
generated
39
flake.lock
generated
@@ -1,26 +1,5 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"fenix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728282832,
|
|
||||||
"narHash": "sha256-I7AbcwGggf+CHqpyd/9PiAjpIBGTGx5woYHqtwxaV7I=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "fenix",
|
|
||||||
"rev": "1ec71be1f4b8f3105c5d38da339cb061fefc43f4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "fenix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
@@ -77,30 +56,12 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"fenix": "fenix",
|
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nix-vm-test": "nix-vm-test",
|
"nix-vm-test": "nix-vm-test",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-analyzer-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728249780,
|
|
||||||
"narHash": "sha256-J269DvCI5dzBmPrXhAAtj566qt0b22TJtF3TIK+tMsI=",
|
|
||||||
"owner": "rust-lang",
|
|
||||||
"repo": "rust-analyzer",
|
|
||||||
"rev": "2b750da1a1a2c1d2c70896108d7096089842d877",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rust-lang",
|
|
||||||
"ref": "nightly",
|
|
||||||
"repo": "rust-analyzer",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
|||||||
11
flake.nix
11
flake.nix
@@ -3,10 +3,6 @@
|
|||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
# for rust nightly with llvm-tools-preview
|
|
||||||
fenix.url = "github:nix-community/fenix";
|
|
||||||
fenix.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
|
|
||||||
nix-vm-test.url = "github:numtide/nix-vm-test";
|
nix-vm-test.url = "github:numtide/nix-vm-test";
|
||||||
nix-vm-test.inputs.nixpkgs.follows = "nixpkgs";
|
nix-vm-test.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-vm-test.inputs.flake-utils.follows = "flake-utils";
|
nix-vm-test.inputs.flake-utils.follows = "flake-utils";
|
||||||
@@ -150,18 +146,21 @@
|
|||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
nushell # for the .ci/gen-workflow-files.nu script
|
nushell # for the .ci/gen-workflow-files.nu script
|
||||||
proverif-patched
|
proverif-patched
|
||||||
inputs.fenix.packages.${system}.complete.toolchain
|
|
||||||
pkgs.cargo-llvm-cov
|
pkgs.cargo-llvm-cov
|
||||||
pkgs.grcov
|
pkgs.grcov
|
||||||
|
pkgs.rust-bin.stable.latest.complete
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
devShells.coverage = pkgs.mkShell {
|
devShells.coverage = pkgs.mkShell {
|
||||||
inputsFrom = [ pkgs.rosenpass ];
|
inputsFrom = [ pkgs.rosenpass ];
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
inputs.fenix.packages.${system}.complete.toolchain
|
|
||||||
pkgs.cargo-llvm-cov
|
pkgs.cargo-llvm-cov
|
||||||
pkgs.grcov
|
pkgs.grcov
|
||||||
|
pkgs.rustc.llvmPackages.llvm
|
||||||
];
|
];
|
||||||
|
env = {
|
||||||
|
inherit (pkgs.cargo-llvm-cov) LLVM_COV LLVM_PROFDATA;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
checks =
|
checks =
|
||||||
|
|||||||
Reference in New Issue
Block a user