From 182a59b5528075c0171756bff71275db8a7995f0 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Fri, 22 Oct 2021 12:07:41 +0900
Subject: Update to rust 1.56 + 2021 edition

---
 flake.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index bcc9383e..c1145268 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    rust-overlay.url = "github:oxalica/rust-overlay";
     nixCargoIntegration = {
       url = "github:yusdacra/nix-cargo-integration";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rustOverlay.follows = "rust-overlay";
     };
     flakeCompat = {
       url = "github:edolstra/flake-compat";
-- 
cgit v1.2.3-70-g09d2


From 4b4e972af00a97c7b6e164f4cfdac38954ebae58 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Sat, 23 Oct 2021 15:20:45 +0900
Subject: nix: Update lld to 12

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index c1145268..296a68d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,7 +63,7 @@
             '';
           };
         shell = common: prev: {
-          packages = prev.packages ++ (with common.pkgs; [ lld_10 lldb cargo-tarpaulin ]);
+          packages = prev.packages ++ (with common.pkgs; [ lld_12 lldb cargo-tarpaulin ]);
           env = prev.env ++ [
             { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
             { name = "RUST_BACKTRACE"; value = "1"; }
-- 
cgit v1.2.3-70-g09d2