Compare commits

..

No commits in common. "d07a769a376238835a5c768bacc86f047f0898c5" and "5727abc8e4b5a7181d147ff142d8f5eb90cd17a1" have entirely different histories.

2 changed files with 59 additions and 66 deletions

View file

@ -1,26 +1,5 @@
{ {
"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"
@ -41,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725983898, "lastModified": 1723637854,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,27 +34,44 @@
"type": "github" "type": "github"
} }
}, },
"root": { "nixpkgs_2": {
"inputs": {
"fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": { "locked": {
"lastModified": 1725985110, "lastModified": 1718428119,
"narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=", "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
"owner": "rust-lang", "owner": "NixOS",
"repo": "rust-analyzer", "repo": "nixpkgs",
"rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8", "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rust-lang", "owner": "NixOS",
"ref": "nightly", "ref": "nixpkgs-unstable",
"repo": "rust-analyzer", "repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1723947704,
"narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github" "type": "github"
} }
}, },

View file

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