From a45df126999e4c081c0f2b26e20f2a7fedcd7b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 22 Nov 2021 10:32:35 +0900
Subject: [PATCH] nix: Update to lld 13, drop flake-compat (was unused)
---
flake.lock | 17 -----------------
flake.nix | 6 +-----
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
index 2029d580..db0fface 100644
--- a/flake.lock
+++ b/flake.lock
@@ -30,22 +30,6 @@
"type": "github"
}
},
- "flakeCompat": {
- "flake": false,
- "locked": {
- "lastModified": 1627913399,
- "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
"nixCargoIntegration": {
"inputs": {
"devshell": "devshell",
@@ -103,7 +87,6 @@
},
"root": {
"inputs": {
- "flakeCompat": "flakeCompat",
"nixCargoIntegration": "nixCargoIntegration",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
diff --git a/flake.nix b/flake.nix
index 296a68d5..cbf10c97 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,10 +9,6 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.rustOverlay.follows = "rust-overlay";
};
- flakeCompat = {
- url = "github:edolstra/flake-compat";
- flake = false;
- };
};
outputs = inputs@{ self, nixCargoIntegration, ... }:
@@ -63,7 +59,7 @@
'';
};
shell = common: prev: {
- packages = prev.packages ++ (with common.pkgs; [ lld_12 lldb cargo-tarpaulin ]);
+ packages = prev.packages ++ (with common.pkgs; [ lld_13 lldb cargo-tarpaulin ]);
env = prev.env ++ [
{ name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
{ name = "RUST_BACKTRACE"; value = "1"; }