noa/flurry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: use new devshell format (#20)

Browse source 
Use devShells.${system}.default instead of devShell, since the latter is
deprecated
This commit is contained in:
Noa Aarts 2024-10-21 00:06:17 +02:00 • committed by GitHub
commit 64961d11e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -1,13 +1,13 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/master";
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, fenix, nixpkgs, ... }: outputs = { fenix, nixpkgs, ... }:
let let
allSystems = [ allSystems = [
"x86_64-linux" # 64-bit Intel/AMD Linux "x86_64-linux" # 64-bit Intel/AMD Linux
@ -23,7 +23,7 @@
in in
{ {
packages = forAllSystems packages = forAllSystems
({ system, pkgs, fpkgs }: ({ pkgs, fpkgs, ... }:
let let
toolchain = fpkgs.minimal.toolchain; toolchain = fpkgs.minimal.toolchain;
in in
@ -37,18 +37,23 @@
src = pkgs.lib.cleanSource ./.; src = pkgs.lib.cleanSource ./.;
}; };
}); });
devShell = forAllSystems ({ system, pkgs, fpkgs }: devShells = forAllSystems
({ pkgs, fpkgs, ... }:
let let
ffpkgs = fpkgs.complete; ffpkgs = fpkgs.complete;
in in
pkgs.mkShell { {
default = pkgs.mkShell
{
buildInputs = [ buildInputs = [
ffpkgs.cargo ffpkgs.cargo
ffpkgs.clippy ffpkgs.clippy
ffpkgs.rust-src ffpkgs.rust-src
ffpkgs.rustc ffpkgs.rustc
ffpkgs.rustfmt ffpkgs.rustfmt
pkgs.wgo
]; ];
};
}); });
}; };
} }