Skip to content

Commit 30e1df0

Browse files
committed
Revert "bulid(nix): use new fenix for dev shell"
This reverts commit 5069b58.
1 parent 3959305 commit 30e1df0

File tree

2 files changed

+4
-62
lines changed

2 files changed

+4
-62
lines changed

flake.lock

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

flake.nix

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
{
22
description = "Delta Chat core";
33
inputs = {
4-
# Old Rust to build releases.
54
fenix.url = "github:nix-community/fenix?rev=85f4139f3c092cf4afd9f9906d7ed218ef262c97";
6-
7-
# New Rust for development shell.
8-
new-fenix.url = "github:nix-community/fenix";
9-
105
flake-utils.url = "github:numtide/flake-utils";
116
naersk.url = "github:nix-community/naersk";
127
nix-filter.url = "github:numtide/nix-filter";
138
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
149
android.url = "github:tadfisher/android-nixpkgs";
1510
};
16-
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, new-fenix, android }:
11+
outputs = { self, nixpkgs, flake-utils, nix-filter, naersk, fenix, android }:
1712
flake-utils.lib.eachDefaultSystem (system:
1813
let
1914
pkgs = nixpkgs.legacyPackages.${system};
@@ -543,13 +538,13 @@
543538
let
544539
pkgs = import nixpkgs {
545540
system = system;
546-
overlays = [ new-fenix.overlays.default ];
541+
overlays = [ fenix.overlays.default ];
547542
};
548543
in
549544
pkgs.mkShell {
550545

551546
buildInputs = with pkgs; [
552-
(new-fenix.packages.${system}.complete.withComponents [
547+
(fenix.packages.${system}.complete.withComponents [
553548
"cargo"
554549
"clippy"
555550
"rust-src"

0 commit comments

Comments
 (0)