Skip to content

Commit 5069b58

Browse files
committed
bulid(nix): use new fenix for dev shell
1 parent d822da3 commit 5069b58

File tree

2 files changed

+62
-4
lines changed

2 files changed

+62
-4
lines changed

flake.lock

Lines changed: 54 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
{
22
description = "Delta Chat core";
33
inputs = {
4+
# Old Rust to build releases.
45
fenix.url = "github:nix-community/fenix?rev=85f4139f3c092cf4afd9f9906d7ed218ef262c97";
6+
7+
# New Rust for development shell.
8+
new-fenix.url = "github:nix-community/fenix";
9+
510
flake-utils.url = "github:numtide/flake-utils";
611
naersk.url = "github:nix-community/naersk";
712
nix-filter.url = "github:numtide/nix-filter";
813
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
914
android.url = "github:tadfisher/android-nixpkgs";
1015
};
11-
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
16+
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, new-fenix, android }:
1217
flake-utils.lib.eachDefaultSystem (system:
1318
let
1419
pkgs = nixpkgs.legacyPackages.${system};
@@ -539,13 +544,13 @@
539544
let
540545
pkgs = import nixpkgs {
541546
system = system;
542-
overlays = [ fenix.overlays.default ];
547+
overlays = [ new-fenix.overlays.default ];
543548
};
544549
in
545550
pkgs.mkShell {
546551

547552
buildInputs = with pkgs; [
548-
(fenix.packages.${system}.complete.withComponents [
553+
(new-fenix.packages.${system}.complete.withComponents [
549554
"cargo"
550555
"clippy"
551556
"rust-src"

0 commit comments

Comments
 (0)