youwen5/nix-dev-envs
1
0
Fork 0
mirror of https://github.com/youwen5/nix-dev-envs.git synced 2024-11-24 18:33:50 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: use fenix instead of rust-overlay

Browse source
This commit is contained in:
Youwen Wu 2024-09-12 01:35:54 -07:00
parent 5727abc8e4
commit 8a506bb4c8
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
2 changed files with 58 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
flake.lock
View file

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1726116637,
"narHash": "sha256-tU2GhwU887mPg6C4c2k+CEBAnKY6R0tSeQYtoqjZmLM=",
"owner": "nix-community",
"repo": "fenix",
"rev": "96a04a213838c5001619ad57400c5a176fa040b1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -34,44 +55,27 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1718428119,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"rust-overlay": "rust-overlay"
} }
}, },
"rust-overlay": { "rust-analyzer-src": {
"inputs": { "flake": false,
"nixpkgs": "nixpkgs_2"
},
"locked": { "locked": {
"lastModified": 1723947704, "lastModified": 1725985110,
"narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=",
"owner": "oxalica", "owner": "rust-lang",
"repo": "rust-overlay", "repo": "rust-analyzer",
"rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "oxalica", "owner": "rust-lang",
"repo": "rust-overlay", "ref": "nightly",
"repo": "rust-analyzer",
"type": "github" "type": "github"
} }
}, },

39
flake.nix
View file

@ -4,22 +4,28 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
rust-overlay.url = "github:oxalica/rust-overlay"; fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { outputs =
{
nixpkgs, nixpkgs,
flake-utils, flake-utils,
rust-overlay, fenix,
... ...
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: let system:
overlays = [(import rust-overlay)]; let
pkgs = import nixpkgs { pkgs = import nixpkgs { inherit system; };
inherit system overlays; rustPkgs = fenix.packages.${system};
}; in
in { {
formatter = pkgs.nixfmt-rfc-style;
devShells = { devShells = {
go = pkgs.mkShell { go = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@ -58,23 +64,20 @@
}; };
rustBeta = pkgs.mkShell { rustBeta = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = [
rust-bin.beta.latest.default rustPkgs.beta.completeToolchain
rust-analyzer
]; ];
}; };
rustNightly = pkgs.mkShell { rustNightly = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = [
rust-bin.nightly.latest.default rustPkgs.complete.toolchain
rust-analyzer
]; ];
}; };
rustStable = pkgs.mkShell { rustStable = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = [
rust-bin.stable.latest.default rustPkgs.stable.completeToolchain
rust-analyzer
]; ];
}; };